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

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

Issue 536533004: Android: Remove more browser extensions code, and fullscreen ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext_browser_clean
Patch Set: Created 6 years, 3 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
OLDNEW
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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/browser_process_platform_part.h" 42 #include "chrome/browser/browser_process_platform_part.h"
43 #include "chrome/browser/browser_shutdown.h" 43 #include "chrome/browser/browser_shutdown.h"
44 #include "chrome/browser/chrome_browser_main_extra_parts.h" 44 #include "chrome/browser/chrome_browser_main_extra_parts.h"
45 #include "chrome/browser/component_updater/cld_component_installer.h" 45 #include "chrome/browser/component_updater/cld_component_installer.h"
46 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" 46 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h"
47 #include "chrome/browser/component_updater/flash_component_installer.h" 47 #include "chrome/browser/component_updater/flash_component_installer.h"
48 #include "chrome/browser/component_updater/recovery_component_installer.h" 48 #include "chrome/browser/component_updater/recovery_component_installer.h"
49 #include "chrome/browser/component_updater/swiftshader_component_installer.h" 49 #include "chrome/browser/component_updater/swiftshader_component_installer.h"
50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" 50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
51 #include "chrome/browser/defaults.h" 51 #include "chrome/browser/defaults.h"
52 #include "chrome/browser/extensions/extension_service.h"
53 #include "chrome/browser/extensions/startup_helper.h"
54 #include "chrome/browser/first_run/first_run.h" 52 #include "chrome/browser/first_run/first_run.h"
55 #include "chrome/browser/first_run/upgrade_util.h" 53 #include "chrome/browser/first_run/upgrade_util.h"
56 #include "chrome/browser/google/google_search_counter.h" 54 #include "chrome/browser/google/google_search_counter.h"
57 #include "chrome/browser/gpu/gl_string_manager.h" 55 #include "chrome/browser/gpu/gl_string_manager.h"
58 #include "chrome/browser/gpu/three_d_api_observer.h" 56 #include "chrome/browser/gpu/three_d_api_observer.h"
59 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 57 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
60 #include "chrome/browser/metrics/field_trial_synchronizer.h" 58 #include "chrome/browser/metrics/field_trial_synchronizer.h"
61 #include "chrome/browser/metrics/thread_watcher.h" 59 #include "chrome/browser/metrics/thread_watcher.h"
62 #include "chrome/browser/metrics/tracking_synchronizer.h" 60 #include "chrome/browser/metrics/tracking_synchronizer.h"
63 #include "chrome/browser/metrics/variations/variations_service.h" 61 #include "chrome/browser/metrics/variations/variations_service.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 #include "components/variations/variations_http_header_provider.h" 114 #include "components/variations/variations_http_header_provider.h"
117 #include "content/public/browser/browser_thread.h" 115 #include "content/public/browser/browser_thread.h"
118 #include "content/public/browser/notification_observer.h" 116 #include "content/public/browser/notification_observer.h"
119 #include "content/public/browser/notification_registrar.h" 117 #include "content/public/browser/notification_registrar.h"
120 #include "content/public/browser/notification_service.h" 118 #include "content/public/browser/notification_service.h"
121 #include "content/public/browser/notification_types.h" 119 #include "content/public/browser/notification_types.h"
122 #include "content/public/browser/site_instance.h" 120 #include "content/public/browser/site_instance.h"
123 #include "content/public/common/content_client.h" 121 #include "content/public/common/content_client.h"
124 #include "content/public/common/content_switches.h" 122 #include "content/public/common/content_switches.h"
125 #include "content/public/common/main_function_params.h" 123 #include "content/public/common/main_function_params.h"
126 #include "extensions/browser/extension_protocols.h"
127 #include "grit/app_locale_settings.h" 124 #include "grit/app_locale_settings.h"
128 #include "grit/platform_locale_settings.h" 125 #include "grit/platform_locale_settings.h"
129 #include "net/base/net_module.h" 126 #include "net/base/net_module.h"
130 #include "net/base/sdch_manager.h" 127 #include "net/base/sdch_manager.h"
131 #include "net/cookies/cookie_monster.h" 128 #include "net/cookies/cookie_monster.h"
132 #include "net/http/http_network_layer.h" 129 #include "net/http/http_network_layer.h"
133 #include "net/http/http_stream_factory.h" 130 #include "net/http/http_stream_factory.h"
134 #include "net/url_request/url_request.h" 131 #include "net/url_request/url_request.h"
135 #include "ui/base/l10n/l10n_util.h" 132 #include "ui/base/l10n/l10n_util.h"
136 #include "ui/base/layout.h" 133 #include "ui/base/layout.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 179
183 #include "base/mac/scoped_nsautorelease_pool.h" 180 #include "base/mac/scoped_nsautorelease_pool.h"
184 #include "chrome/browser/mac/keystone_glue.h" 181 #include "chrome/browser/mac/keystone_glue.h"
185 #endif 182 #endif
186 183
187 #if !defined(DISABLE_NACL) 184 #if !defined(DISABLE_NACL)
188 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" 185 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
189 #include "components/nacl/browser/nacl_process_host.h" 186 #include "components/nacl/browser/nacl_process_host.h"
190 #endif 187 #endif
191 188
189 #if defined(ENABLE_EXTENSIONS)
190 #include "chrome/browser/extensions/startup_helper.h"
191 #include "extensions/browser/extension_protocols.h"
192 #endif
193
192 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) 194 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD)
193 #include "printing/printed_document.h" 195 #include "printing/printed_document.h"
194 #endif 196 #endif
195 197
196 #if defined(ENABLE_RLZ) 198 #if defined(ENABLE_RLZ)
197 #include "chrome/browser/rlz/rlz.h" 199 #include "chrome/browser/rlz/rlz.h"
198 #endif 200 #endif
199 201
200 #if defined(ENABLE_WEBRTC) 202 #if defined(ENABLE_WEBRTC)
201 #include "chrome/browser/media/webrtc_log_util.h" 203 #include "chrome/browser/media/webrtc_log_util.h"
(...skipping 1478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 chromeos::CrosSettings::Shutdown(); 1682 chromeos::CrosSettings::Shutdown();
1681 #endif 1683 #endif
1682 #endif 1684 #endif
1683 } 1685 }
1684 1686
1685 // Public members: 1687 // Public members:
1686 1688
1687 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1689 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1688 chrome_extra_parts_.push_back(parts); 1690 chrome_extra_parts_.push_back(parts);
1689 } 1691 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/chrome_browser_ui.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698