| 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 <shellapi.h> | 7 #include <shellapi.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 #include <windows.h> | 10 #include <windows.h> |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 | 364 |
| 365 UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice(nullptr)); | 365 UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice(nullptr)); |
| 366 | 366 |
| 367 // Set up a task to verify installed modules in the current process. | 367 // Set up a task to verify installed modules in the current process. |
| 368 content::BrowserThread::PostAfterStartupTask( | 368 content::BrowserThread::PostAfterStartupTask( |
| 369 FROM_HERE, content::BrowserThread::GetBlockingPool(), | 369 FROM_HERE, content::BrowserThread::GetBlockingPool(), |
| 370 base::Bind(&VerifyInstallation)); | 370 base::Bind(&VerifyInstallation)); |
| 371 | 371 |
| 372 InitializeChromeElf(); | 372 InitializeChromeElf(); |
| 373 | 373 |
| 374 #if defined(GOOGLE_CHROME_BUILD) |
| 375 did_run_updater_.reset(new DidRunUpdater); |
| 376 #endif |
| 377 |
| 374 if (base::FeatureList::IsEnabled(safe_browsing::kSettingsResetPrompt)) { | 378 if (base::FeatureList::IsEnabled(safe_browsing::kSettingsResetPrompt)) { |
| 375 content::BrowserThread::PostAfterStartupTask( | 379 content::BrowserThread::PostAfterStartupTask( |
| 376 FROM_HERE, | 380 FROM_HERE, |
| 377 content::BrowserThread::GetTaskRunnerForThread( | 381 content::BrowserThread::GetTaskRunnerForThread( |
| 378 content::BrowserThread::UI), | 382 content::BrowserThread::UI), |
| 379 base::Bind(safe_browsing::MaybeShowSettingsResetPromptWithDelay)); | 383 base::Bind(safe_browsing::MaybeShowSettingsResetPromptWithDelay)); |
| 380 } | 384 } |
| 381 | 385 |
| 382 // Record UMA data about whether the fault-tolerant heap is enabled. | 386 // Record UMA data about whether the fault-tolerant heap is enabled. |
| 383 // Use a delayed task to minimize the impact on startup time. | 387 // Use a delayed task to minimize the impact on startup time. |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 if (resource_id) | 554 if (resource_id) |
| 551 return l10n_util::GetStringUTF16(resource_id); | 555 return l10n_util::GetStringUTF16(resource_id); |
| 552 return base::string16(); | 556 return base::string16(); |
| 553 } | 557 } |
| 554 | 558 |
| 555 // static | 559 // static |
| 556 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { | 560 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { |
| 557 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); | 561 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); |
| 558 installer::SetTranslationDelegate(&delegate); | 562 installer::SetTranslationDelegate(&delegate); |
| 559 } | 563 } |
| OLD | NEW |