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

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

Issue 419523006: Experimentally isolate GetOpenFileName in a utility process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chrome_select_file_dialog_factory_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // TODO(port): several win-only methods have been pulled out of this, but 158 // TODO(port): several win-only methods have been pulled out of this, but
159 // BrowserMain() as a whole needs to be broken apart so that it's usable by 159 // BrowserMain() as a whole needs to be broken apart so that it's usable by
160 // other platforms. For now, it's just a stub. This is a serious work in 160 // other platforms. For now, it's just a stub. This is a serious work in
161 // progress and should not be taken as an indication of a real refactoring. 161 // progress and should not be taken as an indication of a real refactoring.
162 162
163 #if defined(OS_WIN) 163 #if defined(OS_WIN)
164 #include "base/environment.h" // For PreRead experiment. 164 #include "base/environment.h" // For PreRead experiment.
165 #include "base/win/windows_version.h" 165 #include "base/win/windows_version.h"
166 #include "chrome/browser/browser_util_win.h" 166 #include "chrome/browser/browser_util_win.h"
167 #include "chrome/browser/chrome_browser_main_win.h" 167 #include "chrome/browser/chrome_browser_main_win.h"
168 #include "chrome/browser/chrome_select_file_dialog_factory_win.h"
168 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" 169 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
169 #include "chrome/browser/first_run/try_chrome_dialog_view.h" 170 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
170 #include "chrome/browser/first_run/upgrade_util_win.h" 171 #include "chrome/browser/first_run/upgrade_util_win.h"
171 #include "chrome/browser/ui/network_profile_bubble.h" 172 #include "chrome/browser/ui/network_profile_bubble.h"
172 #include "chrome/installer/util/helper.h" 173 #include "chrome/installer/util/helper.h"
173 #include "chrome/installer/util/install_util.h" 174 #include "chrome/installer/util/install_util.h"
174 #include "chrome/installer/util/shell_util.h" 175 #include "chrome/installer/util/shell_util.h"
175 #include "net/base/net_util.h" 176 #include "net/base/net_util.h"
176 #include "ui/base/l10n/l10n_util_win.h" 177 #include "ui/base/l10n/l10n_util_win.h"
177 #include "ui/gfx/win/dpi.h" 178 #include "ui/gfx/win/dpi.h"
179 #include "ui/shell_dialogs/select_file_dialog.h"
178 #endif // defined(OS_WIN) 180 #endif // defined(OS_WIN)
179 181
180 #if defined(OS_MACOSX) 182 #if defined(OS_MACOSX)
181 #include <Security/Security.h> 183 #include <Security/Security.h>
182 184
183 #include "base/mac/scoped_nsautorelease_pool.h" 185 #include "base/mac/scoped_nsautorelease_pool.h"
184 #include "chrome/browser/mac/keystone_glue.h" 186 #include "chrome/browser/mac/keystone_glue.h"
185 #endif 187 #endif
186 188
187 #if !defined(DISABLE_NACL) 189 #if !defined(DISABLE_NACL)
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 // unless we detect another chrome browser running. 1090 // unless we detect another chrome browser running.
1089 if (parsed_command_line().HasSwitch(switches::kUninstall)) { 1091 if (parsed_command_line().HasSwitch(switches::kUninstall)) {
1090 return DoUninstallTasks(already_running); 1092 return DoUninstallTasks(already_running);
1091 } 1093 }
1092 1094
1093 if (parsed_command_line().HasSwitch(switches::kHideIcons) || 1095 if (parsed_command_line().HasSwitch(switches::kHideIcons) ||
1094 parsed_command_line().HasSwitch(switches::kShowIcons)) { 1096 parsed_command_line().HasSwitch(switches::kShowIcons)) {
1095 return ChromeBrowserMainPartsWin::HandleIconsCommands( 1097 return ChromeBrowserMainPartsWin::HandleIconsCommands(
1096 parsed_command_line_); 1098 parsed_command_line_);
1097 } 1099 }
1100
1101 ui::SelectFileDialog::SetFactory(new ChromeSelectFileDialogFactory(
1102 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
1098 #endif 1103 #endif
1099 1104
1100 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) { 1105 if (parsed_command_line().HasSwitch(switches::kMakeDefaultBrowser)) {
1101 return ShellIntegration::SetAsDefaultBrowser() ? 1106 return ShellIntegration::SetAsDefaultBrowser() ?
1102 static_cast<int>(content::RESULT_CODE_NORMAL_EXIT) : 1107 static_cast<int>(content::RESULT_CODE_NORMAL_EXIT) :
1103 static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED); 1108 static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED);
1104 } 1109 }
1105 1110
1106 #if defined(USE_AURA) 1111 #if defined(USE_AURA)
1107 // Make sure aura::Env has been initialized. 1112 // Make sure aura::Env has been initialized.
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 chromeos::CrosSettings::Shutdown(); 1661 chromeos::CrosSettings::Shutdown();
1657 #endif 1662 #endif
1658 #endif 1663 #endif
1659 } 1664 }
1660 1665
1661 // Public members: 1666 // Public members:
1662 1667
1663 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1668 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1664 chrome_extra_parts_.push_back(parts); 1669 chrome_extra_parts_.push_back(parts);
1665 } 1670 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_select_file_dialog_factory_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698