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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
372 void ChromeBrowserMainPartsWin::PostBrowserStart() { | 372 void ChromeBrowserMainPartsWin::PostBrowserStart() { |
373 ChromeBrowserMainParts::PostBrowserStart(); | 373 ChromeBrowserMainParts::PostBrowserStart(); |
374 | 374 |
375 UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice(nullptr)); | 375 UMA_HISTOGRAM_BOOLEAN("Windows.Tablet", base::win::IsTabletDevice(nullptr)); |
376 | 376 |
377 // Set up a task to verify installed modules in the current process. | 377 // Set up a task to verify installed modules in the current process. |
378 content::BrowserThread::PostAfterStartupTask( | 378 content::BrowserThread::PostAfterStartupTask( |
379 FROM_HERE, content::BrowserThread::GetBlockingPool(), | 379 FROM_HERE, content::BrowserThread::GetBlockingPool(), |
380 base::Bind(&VerifyInstallation)); | 380 base::Bind(&VerifyInstallation)); |
381 | 381 |
382 InitializeChromeElf(); | 382 InitializeChromeElf(); |
Nico
2017/05/11 22:34:40
Before removal, the call was here, not down there.
Will Harris
2017/05/11 22:46:32
Done.
| |
383 | 383 |
384 if (base::FeatureList::IsEnabled(safe_browsing::kSettingsResetPrompt)) { | 384 if (base::FeatureList::IsEnabled(safe_browsing::kSettingsResetPrompt)) { |
385 content::BrowserThread::PostAfterStartupTask( | 385 content::BrowserThread::PostAfterStartupTask( |
386 FROM_HERE, | 386 FROM_HERE, |
387 content::BrowserThread::GetTaskRunnerForThread( | 387 content::BrowserThread::GetTaskRunnerForThread( |
388 content::BrowserThread::UI), | 388 content::BrowserThread::UI), |
389 base::Bind(safe_browsing::MaybeShowSettingsResetPromptWithDelay)); | 389 base::Bind(safe_browsing::MaybeShowSettingsResetPromptWithDelay)); |
390 } | 390 } |
391 | 391 |
392 #if defined(GOOGLE_CHROME_BUILD) | |
393 did_run_updater_.reset(new DidRunUpdater); | |
394 #endif | |
395 | |
392 // Record UMA data about whether the fault-tolerant heap is enabled. | 396 // Record UMA data about whether the fault-tolerant heap is enabled. |
393 // Use a delayed task to minimize the impact on startup time. | 397 // Use a delayed task to minimize the impact on startup time. |
394 content::BrowserThread::PostDelayedTask( | 398 content::BrowserThread::PostDelayedTask( |
395 content::BrowserThread::UI, | 399 content::BrowserThread::UI, |
396 FROM_HERE, | 400 FROM_HERE, |
397 base::Bind(&DetectFaultTolerantHeap), | 401 base::Bind(&DetectFaultTolerantHeap), |
398 base::TimeDelta::FromMinutes(1)); | 402 base::TimeDelta::FromMinutes(1)); |
399 } | 403 } |
400 | 404 |
401 // static | 405 // static |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
561 if (resource_id) | 565 if (resource_id) |
562 return l10n_util::GetStringUTF16(resource_id); | 566 return l10n_util::GetStringUTF16(resource_id); |
563 return base::string16(); | 567 return base::string16(); |
564 } | 568 } |
565 | 569 |
566 // static | 570 // static |
567 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { | 571 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { |
568 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); | 572 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); |
569 installer::SetTranslationDelegate(&delegate); | 573 installer::SetTranslationDelegate(&delegate); |
570 } | 574 } |
OLD | NEW |