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

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

Issue 6672070: Move the remaining files in chrome\common to content\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « chrome/browser/browser_main_mac.mm ('k') | chrome/browser/chromeos/login/eula_view.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 #include "chrome/browser/browser_main_win.h" 6 #include "chrome/browser/browser_main_win.h"
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 10
11 #include <algorithm> 11 #include <algorithm>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/environment.h" 14 #include "base/environment.h"
15 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
16 #include "base/nss_util.h" 16 #include "base/nss_util.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/scoped_native_library.h" 18 #include "base/scoped_native_library.h"
19 #include "base/scoped_ptr.h" 19 #include "base/scoped_ptr.h"
20 #include "base/utf_string_conversions.h" 20 #include "base/utf_string_conversions.h"
21 #include "base/win/windows_version.h" 21 #include "base/win/windows_version.h"
22 #include "base/win/wrapped_window_proc.h" 22 #include "base/win/wrapped_window_proc.h"
23 #include "chrome/browser/browser_list.h" 23 #include "chrome/browser/browser_list.h"
24 #include "chrome/browser/first_run/first_run.h" 24 #include "chrome/browser/first_run/first_run.h"
25 #include "chrome/browser/metrics/metrics_service.h" 25 #include "chrome/browser/metrics/metrics_service.h"
26 #include "chrome/browser/ui/views/uninstall_view.h" 26 #include "chrome/browser/ui/views/uninstall_view.h"
27 #include "chrome/common/chrome_constants.h" 27 #include "chrome/common/chrome_constants.h"
28 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/env_vars.h" 29 #include "chrome/common/env_vars.h"
30 #include "chrome/common/result_codes.h"
31 #include "chrome/installer/util/browser_distribution.h" 30 #include "chrome/installer/util/browser_distribution.h"
32 #include "chrome/installer/util/helper.h" 31 #include "chrome/installer/util/helper.h"
33 #include "chrome/installer/util/install_util.h" 32 #include "chrome/installer/util/install_util.h"
34 #include "chrome/installer/util/shell_util.h" 33 #include "chrome/installer/util/shell_util.h"
35 #include "content/common/main_function_params.h" 34 #include "content/common/main_function_params.h"
35 #include "content/common/result_codes.h"
36 #include "grit/chromium_strings.h" 36 #include "grit/chromium_strings.h"
37 #include "grit/generated_resources.h" 37 #include "grit/generated_resources.h"
38 #include "net/base/winsock_init.h" 38 #include "net/base/winsock_init.h"
39 #include "net/socket/client_socket_factory.h" 39 #include "net/socket/client_socket_factory.h"
40 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
41 #include "ui/base/l10n/l10n_util_win.h" 41 #include "ui/base/l10n/l10n_util_win.h"
42 #include "ui/base/message_box_win.h" 42 #include "ui/base/message_box_win.h"
43 #include "views/focus/accelerator_handler.h" 43 #include "views/focus/accelerator_handler.h"
44 #include "views/window/window.h" 44 #include "views/window/window.h"
45 45
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 base::EnsureNSPRInit(); 297 base::EnsureNSPRInit();
298 } 298 }
299 } 299 }
300 }; 300 };
301 301
302 // static 302 // static
303 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( 303 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
304 const MainFunctionParams& parameters) { 304 const MainFunctionParams& parameters) {
305 return new BrowserMainPartsWin(parameters); 305 return new BrowserMainPartsWin(parameters);
306 } 306 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main_mac.mm ('k') | chrome/browser/chromeos/login/eula_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698