Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 2122303002: Revive experiment to isolate shell operations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 if (parsed_command_line().HasSwitch(switches::kUninstall)) { 1444 if (parsed_command_line().HasSwitch(switches::kUninstall)) {
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)));
1456 #endif // defined(OS_WIN) 1455 #endif // defined(OS_WIN)
1457 1456
1458 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) { 1457 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) {
1459 bool is_managed = g_browser_process->local_state()->IsManagedPreference( 1458 bool is_managed = g_browser_process->local_state()->IsManagedPreference(
1460 prefs::kDefaultBrowserSettingEnabled); 1459 prefs::kDefaultBrowserSettingEnabled);
1461 if (is_managed && !g_browser_process->local_state()->GetBoolean( 1460 if (is_managed && !g_browser_process->local_state()->GetBoolean(
1462 prefs::kDefaultBrowserSettingEnabled)) { 1461 prefs::kDefaultBrowserSettingEnabled)) {
1463 return static_cast<int>(chrome::RESULT_CODE_ACTION_DISALLOWED_BY_POLICY); 1462 return static_cast<int>(chrome::RESULT_CODE_ACTION_DISALLOWED_BY_POLICY);
1464 } 1463 }
1465 1464
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
2034 chromeos::CrosSettings::Shutdown(); 2033 chromeos::CrosSettings::Shutdown();
2035 #endif // defined(OS_CHROMEOS) 2034 #endif // defined(OS_CHROMEOS)
2036 #endif // defined(OS_ANDROID) 2035 #endif // defined(OS_ANDROID)
2037 } 2036 }
2038 2037
2039 // Public members: 2038 // Public members:
2040 2039
2041 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2040 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2042 chrome_extra_parts_.push_back(parts); 2041 chrome_extra_parts_.push_back(parts);
2043 } 2042 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698