OLD | NEW |
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 "app/l10n_util.h" |
7 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
8 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
9 #include "base/command_line.h" | 10 #include "base/command_line.h" |
10 #include "base/event_recorder.h" | 11 #include "base/event_recorder.h" |
11 #include "base/file_path.h" | 12 #include "base/file_path.h" |
12 #include "base/histogram.h" | 13 #include "base/histogram.h" |
13 #include "base/path_service.h" | 14 #include "base/path_service.h" |
14 #include "base/string_util.h" | 15 #include "base/string_util.h" |
15 #include "base/sys_info.h" | 16 #include "base/sys_info.h" |
16 #include "chrome/browser/autocomplete/autocomplete.h" | 17 #include "chrome/browser/autocomplete/autocomplete.h" |
(...skipping 11 matching lines...) Expand all Loading... |
28 #include "chrome/browser/sessions/session_restore.h" | 29 #include "chrome/browser/sessions/session_restore.h" |
29 #include "chrome/browser/shell_integration.h" | 30 #include "chrome/browser/shell_integration.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/tab_contents/tab_contents.h" | 33 #include "chrome/browser/tab_contents/tab_contents.h" |
33 #include "chrome/browser/tab_contents/tab_contents_view.h" | 34 #include "chrome/browser/tab_contents/tab_contents_view.h" |
34 #include "chrome/browser/net/url_fixer_upper.h" | 35 #include "chrome/browser/net/url_fixer_upper.h" |
35 #include "chrome/common/chrome_constants.h" | 36 #include "chrome/common/chrome_constants.h" |
36 #include "chrome/common/chrome_paths.h" | 37 #include "chrome/common/chrome_paths.h" |
37 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
38 #include "chrome/common/l10n_util.h" | |
39 #include "chrome/common/pref_names.h" | 39 #include "chrome/common/pref_names.h" |
40 #include "chrome/common/pref_service.h" | 40 #include "chrome/common/pref_service.h" |
41 #include "chrome/common/result_codes.h" | 41 #include "chrome/common/result_codes.h" |
42 #include "grit/chromium_strings.h" | 42 #include "grit/chromium_strings.h" |
43 #include "grit/generated_resources.h" | 43 #include "grit/generated_resources.h" |
44 #include "grit/locale_settings.h" | 44 #include "grit/locale_settings.h" |
45 #include "grit/theme_resources.h" | 45 #include "grit/theme_resources.h" |
46 #include "net/base/cookie_monster.h" | 46 #include "net/base/cookie_monster.h" |
47 #include "webkit/glue/webkit_glue.h" | 47 #include "webkit/glue/webkit_glue.h" |
48 | 48 |
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 bool launched = lwp.Launch(profile, process_startup); | 677 bool launched = lwp.Launch(profile, process_startup); |
678 if (!launched) { | 678 if (!launched) { |
679 LOG(ERROR) << "launch error"; | 679 LOG(ERROR) << "launch error"; |
680 if (return_code != NULL) | 680 if (return_code != NULL) |
681 *return_code = ResultCodes::INVALID_CMDLINE_URL; | 681 *return_code = ResultCodes::INVALID_CMDLINE_URL; |
682 return false; | 682 return false; |
683 } | 683 } |
684 | 684 |
685 return true; | 685 return true; |
686 } | 686 } |
OLD | NEW |