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

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

Issue 2098713003: Moved a bunch of win-specific files to the new win folder in chrome/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « chrome/browser/browser_util_win.cc ('k') | chrome/browser/chrome_browser_main_win.cc » ('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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 189
190 // TODO(port): several win-only methods have been pulled out of this, but 190 // TODO(port): several win-only methods have been pulled out of this, but
191 // BrowserMain() as a whole needs to be broken apart so that it's usable by 191 // BrowserMain() as a whole needs to be broken apart so that it's usable by
192 // other platforms. For now, it's just a stub. This is a serious work in 192 // other platforms. For now, it's just a stub. This is a serious work in
193 // progress and should not be taken as an indication of a real refactoring. 193 // progress and should not be taken as an indication of a real refactoring.
194 194
195 #if defined(OS_WIN) 195 #if defined(OS_WIN)
196 #include "base/trace_event/trace_event_etw_export_win.h" 196 #include "base/trace_event/trace_event_etw_export_win.h"
197 #include "base/win/windows_version.h" 197 #include "base/win/windows_version.h"
198 #include "chrome/app/file_pre_reader_win.h" 198 #include "chrome/app/file_pre_reader_win.h"
199 #include "chrome/browser/browser_util_win.h"
200 #include "chrome/browser/chrome_browser_main_win.h" 199 #include "chrome/browser/chrome_browser_main_win.h"
201 #include "chrome/browser/chrome_select_file_dialog_factory_win.h"
202 #include "chrome/browser/component_updater/caps_installer_win.h" 200 #include "chrome/browser/component_updater/caps_installer_win.h"
203 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" 201 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
204 #include "chrome/browser/downgrade/user_data_downgrade.h" 202 #include "chrome/browser/downgrade/user_data_downgrade.h"
205 #include "chrome/browser/first_run/try_chrome_dialog_view.h" 203 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
206 #include "chrome/browser/first_run/upgrade_util_win.h" 204 #include "chrome/browser/first_run/upgrade_util_win.h"
207 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 205 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
208 #include "chrome/browser/ui/network_profile_bubble.h" 206 #include "chrome/browser/ui/network_profile_bubble.h"
207 #include "chrome/browser/win/browser_util.h"
208 #include "chrome/browser/win/chrome_select_file_dialog_factory.h"
209 #include "chrome/installer/util/browser_distribution.h" 209 #include "chrome/installer/util/browser_distribution.h"
210 #include "chrome/installer/util/helper.h" 210 #include "chrome/installer/util/helper.h"
211 #include "chrome/installer/util/install_util.h" 211 #include "chrome/installer/util/install_util.h"
212 #include "chrome/installer/util/module_util_win.h" 212 #include "chrome/installer/util/module_util_win.h"
213 #include "chrome/installer/util/shell_util.h" 213 #include "chrome/installer/util/shell_util.h"
214 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win. h" 214 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win. h"
215 #include "ui/base/l10n/l10n_util_win.h" 215 #include "ui/base/l10n/l10n_util_win.h"
216 #include "ui/shell_dialogs/select_file_dialog.h" 216 #include "ui/shell_dialogs/select_file_dialog.h"
217 #endif // defined(OS_WIN) 217 #endif // defined(OS_WIN)
218 218
(...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_util_win.cc ('k') | chrome/browser/chrome_browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698