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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 #include "chrome/browser/pref_service_flags_storage.h" | 83 #include "chrome/browser/pref_service_flags_storage.h" |
84 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 84 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
85 #include "chrome/browser/prefs/command_line_pref_store.h" | 85 #include "chrome/browser/prefs/command_line_pref_store.h" |
86 #include "chrome/browser/prefs/pref_metrics_service.h" | 86 #include "chrome/browser/prefs/pref_metrics_service.h" |
87 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 87 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
88 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.
h" | 88 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.
h" |
89 #include "chrome/browser/process_singleton.h" | 89 #include "chrome/browser/process_singleton.h" |
90 #include "chrome/browser/profiles/profile.h" | 90 #include "chrome/browser/profiles/profile.h" |
91 #include "chrome/browser/profiles/profile_manager.h" | 91 #include "chrome/browser/profiles/profile_manager.h" |
92 #include "chrome/browser/profiles/profiles_state.h" | 92 #include "chrome/browser/profiles/profiles_state.h" |
93 #include "chrome/browser/service/service_process_control.h" | |
94 #include "chrome/browser/shell_integration.h" | 93 #include "chrome/browser/shell_integration.h" |
95 #include "chrome/browser/three_d_api_observer.h" | 94 #include "chrome/browser/three_d_api_observer.h" |
96 #include "chrome/browser/translate/translate_manager.h" | 95 #include "chrome/browser/translate/translate_manager.h" |
97 #include "chrome/browser/ui/app_list/app_list_service.h" | 96 #include "chrome/browser/ui/app_list/app_list_service.h" |
98 #include "chrome/browser/ui/browser.h" | 97 #include "chrome/browser/ui/browser.h" |
99 #include "chrome/browser/ui/browser_finder.h" | 98 #include "chrome/browser/ui/browser_finder.h" |
100 #include "chrome/browser/ui/host_desktop.h" | 99 #include "chrome/browser/ui/host_desktop.h" |
101 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 100 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
102 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 101 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
103 #include "chrome/browser/ui/uma_browsing_activity_observer.h" | 102 #include "chrome/browser/ui/uma_browsing_activity_observer.h" |
(...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1693 chromeos::CrosSettings::Shutdown(); | 1692 chromeos::CrosSettings::Shutdown(); |
1694 #endif | 1693 #endif |
1695 #endif | 1694 #endif |
1696 } | 1695 } |
1697 | 1696 |
1698 // Public members: | 1697 // Public members: |
1699 | 1698 |
1700 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1699 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1701 chrome_extra_parts_.push_back(parts); | 1700 chrome_extra_parts_.push_back(parts); |
1702 } | 1701 } |
OLD | NEW |