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