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 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1447 if (parsed_command_line().HasSwitch(switches::kUninstall)) { | 1447 if (parsed_command_line().HasSwitch(switches::kUninstall)) { |
1448 return DoUninstallTasks(already_running); | 1448 return DoUninstallTasks(already_running); |
1449 } | 1449 } |
1450 | 1450 |
1451 if (parsed_command_line().HasSwitch(switches::kHideIcons) || | 1451 if (parsed_command_line().HasSwitch(switches::kHideIcons) || |
1452 parsed_command_line().HasSwitch(switches::kShowIcons)) { | 1452 parsed_command_line().HasSwitch(switches::kShowIcons)) { |
1453 return ChromeBrowserMainPartsWin::HandleIconsCommands( | 1453 return ChromeBrowserMainPartsWin::HandleIconsCommands( |
1454 parsed_command_line_); | 1454 parsed_command_line_); |
1455 } | 1455 } |
1456 | 1456 |
1457 ui::SelectFileDialog::SetFactory(new ChromeSelectFileDialogFactory( | 1457 ui::SelectFileDialog::SetFactory(new ChromeSelectFileDialogFactory()); |
1458 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); | |
1459 #endif // defined(OS_WIN) | 1458 #endif // defined(OS_WIN) |
1460 | 1459 |
1461 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) { | 1460 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) { |
1462 bool is_managed = g_browser_process->local_state()->IsManagedPreference( | 1461 bool is_managed = g_browser_process->local_state()->IsManagedPreference( |
1463 prefs::kDefaultBrowserSettingEnabled); | 1462 prefs::kDefaultBrowserSettingEnabled); |
1464 if (is_managed && !g_browser_process->local_state()->GetBoolean( | 1463 if (is_managed && !g_browser_process->local_state()->GetBoolean( |
1465 prefs::kDefaultBrowserSettingEnabled)) { | 1464 prefs::kDefaultBrowserSettingEnabled)) { |
1466 return static_cast<int>(chrome::RESULT_CODE_ACTION_DISALLOWED_BY_POLICY); | 1465 return static_cast<int>(chrome::RESULT_CODE_ACTION_DISALLOWED_BY_POLICY); |
1467 } | 1466 } |
1468 | 1467 |
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2036 chromeos::CrosSettings::Shutdown(); | 2035 chromeos::CrosSettings::Shutdown(); |
2037 #endif // defined(OS_CHROMEOS) | 2036 #endif // defined(OS_CHROMEOS) |
2038 #endif // defined(OS_ANDROID) | 2037 #endif // defined(OS_ANDROID) |
2039 } | 2038 } |
2040 | 2039 |
2041 // Public members: | 2040 // Public members: |
2042 | 2041 |
2043 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2042 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2044 chrome_extra_parts_.push_back(parts); | 2043 chrome_extra_parts_.push_back(parts); |
2045 } | 2044 } |
OLD | NEW |