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

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

Issue 18305: Move url_* to net subdir (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 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.vcproj ('k') | chrome/browser/browser_main.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_init.h" 5 #include "chrome/browser/browser_init.h"
6 6
7 #include <shellapi.h> 7 #include <shellapi.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/event_recorder.h" 11 #include "base/event_recorder.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/histogram.h" 13 #include "base/histogram.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/process_util.h" 15 #include "base/process_util.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/win_util.h" 17 #include "base/win_util.h"
18 #include "chrome/app/locales/locale_settings.h" 18 #include "chrome/app/locales/locale_settings.h"
19 #include "chrome/app/result_codes.h" 19 #include "chrome/app/result_codes.h"
20 #include "chrome/app/theme/theme_resources.h" 20 #include "chrome/app/theme/theme_resources.h"
21 #include "chrome/browser/automation/automation_provider.h" 21 #include "chrome/browser/automation/automation_provider.h"
22 #include "chrome/browser/browser_list.h" 22 #include "chrome/browser/browser_list.h"
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/dom_ui/new_tab_ui.h" 24 #include "chrome/browser/dom_ui/new_tab_ui.h"
25 #include "chrome/browser/extensions/extensions_service.h" 25 #include "chrome/browser/extensions/extensions_service.h"
26 #include "chrome/browser/first_run.h" 26 #include "chrome/browser/first_run.h"
27 #include "chrome/browser/net/dns_global.h" 27 #include "chrome/browser/net/dns_global.h"
28 #include "chrome/browser/net/url_fixer_upper.h"
28 #include "chrome/browser/session_startup_pref.h" 29 #include "chrome/browser/session_startup_pref.h"
29 #include "chrome/browser/sessions/session_restore.h" 30 #include "chrome/browser/sessions/session_restore.h"
30 #include "chrome/browser/tab_contents/infobar_delegate.h" 31 #include "chrome/browser/tab_contents/infobar_delegate.h"
31 #include "chrome/browser/tab_contents/navigation_controller.h" 32 #include "chrome/browser/tab_contents/navigation_controller.h"
32 #include "chrome/browser/tabs/tab_strip_model.h" 33 #include "chrome/browser/tabs/tab_strip_model.h"
33 #include "chrome/browser/url_fixer_upper.h"
34 #include "chrome/browser/web_app_launcher.h" 34 #include "chrome/browser/web_app_launcher.h"
35 #include "chrome/common/chrome_constants.h" 35 #include "chrome/common/chrome_constants.h"
36 #include "chrome/common/chrome_paths.h" 36 #include "chrome/common/chrome_paths.h"
37 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/l10n_util.h" 38 #include "chrome/common/l10n_util.h"
39 #include "chrome/common/logging_chrome.h" 39 #include "chrome/common/logging_chrome.h"
40 #include "chrome/common/pref_names.h" 40 #include "chrome/common/pref_names.h"
41 #include "chrome/common/pref_service.h" 41 #include "chrome/common/pref_service.h"
42 #include "chrome/common/resource_bundle.h" 42 #include "chrome/common/resource_bundle.h"
43 #include "chrome/common/win_util.h" 43 #include "chrome/common/win_util.h"
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 if (!launched) { 722 if (!launched) {
723 LOG(ERROR) << "launch error"; 723 LOG(ERROR) << "launch error";
724 if (return_code != NULL) { 724 if (return_code != NULL) {
725 *return_code = ResultCodes::INVALID_CMDLINE_URL; 725 *return_code = ResultCodes::INVALID_CMDLINE_URL;
726 } 726 }
727 return false; 727 return false;
728 } 728 }
729 729
730 return true; 730 return true;
731 } 731 }
OLDNEW
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698