OLD | NEW |
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 #include "chrome/browser/process_singleton.h" | 79 #include "chrome/browser/process_singleton.h" |
80 #include "chrome/browser/profiles/profile.h" | 80 #include "chrome/browser/profiles/profile.h" |
81 #include "chrome/browser/profiles/profile_attributes_entry.h" | 81 #include "chrome/browser/profiles/profile_attributes_entry.h" |
82 #include "chrome/browser/profiles/profile_attributes_storage.h" | 82 #include "chrome/browser/profiles/profile_attributes_storage.h" |
83 #include "chrome/browser/profiles/profile_manager.h" | 83 #include "chrome/browser/profiles/profile_manager.h" |
84 #include "chrome/browser/profiles/profiles_state.h" | 84 #include "chrome/browser/profiles/profiles_state.h" |
85 #include "chrome/browser/shell_integration.h" | 85 #include "chrome/browser/shell_integration.h" |
86 #include "chrome/browser/tracing/navigation_tracing.h" | 86 #include "chrome/browser/tracing/navigation_tracing.h" |
87 #include "chrome/browser/translate/translate_service.h" | 87 #include "chrome/browser/translate/translate_service.h" |
88 #include "chrome/browser/ui/app_list/app_list_service.h" | 88 #include "chrome/browser/ui/app_list/app_list_service.h" |
89 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" | |
90 #include "chrome/browser/ui/browser.h" | 89 #include "chrome/browser/ui/browser.h" |
91 #include "chrome/browser/ui/browser_finder.h" | 90 #include "chrome/browser/ui/browser_finder.h" |
| 91 #include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_dialog_f
actory.h" |
92 #include "chrome/browser/ui/startup/bad_flags_prompt.h" | 92 #include "chrome/browser/ui/startup/bad_flags_prompt.h" |
93 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 93 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
94 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 94 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
95 #include "chrome/browser/ui/uma_browsing_activity_observer.h" | 95 #include "chrome/browser/ui/uma_browsing_activity_observer.h" |
96 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 96 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
97 #include "chrome/common/channel_info.h" | 97 #include "chrome/common/channel_info.h" |
98 #include "chrome/common/chrome_constants.h" | 98 #include "chrome/common/chrome_constants.h" |
99 #include "chrome/common/chrome_features.h" | 99 #include "chrome/common/chrome_features.h" |
100 #include "chrome/common/chrome_paths.h" | 100 #include "chrome/common/chrome_paths.h" |
101 #include "chrome/common/chrome_result_codes.h" | 101 #include "chrome/common/chrome_result_codes.h" |
(...skipping 1934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2036 chromeos::CrosSettings::Shutdown(); | 2036 chromeos::CrosSettings::Shutdown(); |
2037 #endif // defined(OS_CHROMEOS) | 2037 #endif // defined(OS_CHROMEOS) |
2038 #endif // defined(OS_ANDROID) | 2038 #endif // defined(OS_ANDROID) |
2039 } | 2039 } |
2040 | 2040 |
2041 // Public members: | 2041 // Public members: |
2042 | 2042 |
2043 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2043 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2044 chrome_extra_parts_.push_back(parts); | 2044 chrome_extra_parts_.push_back(parts); |
2045 } | 2045 } |
OLD | NEW |