| 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.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 chrome_browser::SetupPreReadFieldTrial(); | 790 chrome_browser::SetupPreReadFieldTrial(); |
| 791 #endif // defined(OS_WIN) | 791 #endif // defined(OS_WIN) |
| 792 } | 792 } |
| 793 | 793 |
| 794 // ChromeBrowserMainParts: |SetupMetricsAndFieldTrials()| related -------------- | 794 // ChromeBrowserMainParts: |SetupMetricsAndFieldTrials()| related -------------- |
| 795 | 795 |
| 796 void ChromeBrowserMainParts::StartMetricsRecording() { | 796 void ChromeBrowserMainParts::StartMetricsRecording() { |
| 797 TRACE_EVENT0("startup", "ChromeBrowserMainParts::StartMetricsRecording"); | 797 TRACE_EVENT0("startup", "ChromeBrowserMainParts::StartMetricsRecording"); |
| 798 | 798 |
| 799 g_browser_process->metrics_service()->CheckForClonedInstall( | 799 g_browser_process->metrics_service()->CheckForClonedInstall( |
| 800 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); | 800 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)); |
| 801 | 801 |
| 802 g_browser_process->GetMetricsServicesManager()->UpdateUploadPermissions(true); | 802 g_browser_process->GetMetricsServicesManager()->UpdateUploadPermissions(true); |
| 803 } | 803 } |
| 804 | 804 |
| 805 void ChromeBrowserMainParts::RecordBrowserStartupTime() { | 805 void ChromeBrowserMainParts::RecordBrowserStartupTime() { |
| 806 // Don't record any metrics if UI was displayed before this point e.g. | 806 // Don't record any metrics if UI was displayed before this point e.g. |
| 807 // warning dialogs. | 807 // warning dialogs. |
| 808 if (startup_metric_utils::WasNonBrowserUIDisplayed()) | 808 if (startup_metric_utils::WasNonBrowserUIDisplayed()) |
| 809 return; | 809 return; |
| 810 | 810 |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1445 return DoUninstallTasks(already_running); | 1445 return DoUninstallTasks(already_running); |
| 1446 } | 1446 } |
| 1447 | 1447 |
| 1448 if (parsed_command_line().HasSwitch(switches::kHideIcons) || | 1448 if (parsed_command_line().HasSwitch(switches::kHideIcons) || |
| 1449 parsed_command_line().HasSwitch(switches::kShowIcons)) { | 1449 parsed_command_line().HasSwitch(switches::kShowIcons)) { |
| 1450 return ChromeBrowserMainPartsWin::HandleIconsCommands( | 1450 return ChromeBrowserMainPartsWin::HandleIconsCommands( |
| 1451 parsed_command_line_); | 1451 parsed_command_line_); |
| 1452 } | 1452 } |
| 1453 | 1453 |
| 1454 ui::SelectFileDialog::SetFactory(new ChromeSelectFileDialogFactory( | 1454 ui::SelectFileDialog::SetFactory(new ChromeSelectFileDialogFactory( |
| 1455 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); | 1455 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); |
| 1456 #endif // defined(OS_WIN) | 1456 #endif // defined(OS_WIN) |
| 1457 | 1457 |
| 1458 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) { | 1458 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) { |
| 1459 bool is_managed = g_browser_process->local_state()->IsManagedPreference( | 1459 bool is_managed = g_browser_process->local_state()->IsManagedPreference( |
| 1460 prefs::kDefaultBrowserSettingEnabled); | 1460 prefs::kDefaultBrowserSettingEnabled); |
| 1461 if (is_managed && !g_browser_process->local_state()->GetBoolean( | 1461 if (is_managed && !g_browser_process->local_state()->GetBoolean( |
| 1462 prefs::kDefaultBrowserSettingEnabled)) { | 1462 prefs::kDefaultBrowserSettingEnabled)) { |
| 1463 return static_cast<int>(chrome::RESULT_CODE_ACTION_DISALLOWED_BY_POLICY); | 1463 return static_cast<int>(chrome::RESULT_CODE_ACTION_DISALLOWED_BY_POLICY); |
| 1464 } | 1464 } |
| 1465 | 1465 |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2034 chromeos::CrosSettings::Shutdown(); | 2034 chromeos::CrosSettings::Shutdown(); |
| 2035 #endif // defined(OS_CHROMEOS) | 2035 #endif // defined(OS_CHROMEOS) |
| 2036 #endif // defined(OS_ANDROID) | 2036 #endif // defined(OS_ANDROID) |
| 2037 } | 2037 } |
| 2038 | 2038 |
| 2039 // Public members: | 2039 // Public members: |
| 2040 | 2040 |
| 2041 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2041 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2042 chrome_extra_parts_.push_back(parts); | 2042 chrome_extra_parts_.push_back(parts); |
| 2043 } | 2043 } |
| OLD | NEW |