| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chrome_browser_main_win.h" | 5 #include "chrome/browser/chrome_browser_main_win.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 FROM_HERE, | 368 FROM_HERE, |
| 369 base::Bind(ExecuteFontCacheBuildTask, path), | 369 base::Bind(ExecuteFontCacheBuildTask, path), |
| 370 base::TimeDelta::FromSeconds(kBuildFontCacheDelaySec)); | 370 base::TimeDelta::FromSeconds(kBuildFontCacheDelaySec)); |
| 371 } | 371 } |
| 372 } | 372 } |
| 373 } | 373 } |
| 374 | 374 |
| 375 void ChromeBrowserMainPartsWin::PostBrowserStart() { | 375 void ChromeBrowserMainPartsWin::PostBrowserStart() { |
| 376 ChromeBrowserMainParts::PostBrowserStart(); | 376 ChromeBrowserMainParts::PostBrowserStart(); |
| 377 | 377 |
| 378 UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice()); | 378 UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice(nullptr)); |
| 379 | 379 |
| 380 // Set up a task to verify installed modules in the current process. | 380 // Set up a task to verify installed modules in the current process. |
| 381 content::BrowserThread::PostAfterStartupTask( | 381 content::BrowserThread::PostAfterStartupTask( |
| 382 FROM_HERE, content::BrowserThread::GetBlockingPool(), | 382 FROM_HERE, content::BrowserThread::GetBlockingPool(), |
| 383 base::Bind(&VerifyInstallation)); | 383 base::Bind(&VerifyInstallation)); |
| 384 | 384 |
| 385 InitializeChromeElf(); | 385 InitializeChromeElf(); |
| 386 | 386 |
| 387 #if defined(KASKO) | 387 #if defined(KASKO) |
| 388 content::BrowserThread::PostDelayedTask( | 388 content::BrowserThread::PostDelayedTask( |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 if (resource_id) | 573 if (resource_id) |
| 574 return l10n_util::GetStringUTF16(resource_id); | 574 return l10n_util::GetStringUTF16(resource_id); |
| 575 return base::string16(); | 575 return base::string16(); |
| 576 } | 576 } |
| 577 | 577 |
| 578 // static | 578 // static |
| 579 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { | 579 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { |
| 580 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); | 580 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); |
| 581 installer::SetTranslationDelegate(&delegate); | 581 installer::SetTranslationDelegate(&delegate); |
| 582 } | 582 } |
| OLD | NEW |