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

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

Issue 229733002: Toro: Move ExtensionProtocolHandler to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (extension-protocols) Created 6 years, 8 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
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 #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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/browser/browser_process_platform_part.h" 46 #include "chrome/browser/browser_process_platform_part.h"
47 #include "chrome/browser/browser_shutdown.h" 47 #include "chrome/browser/browser_shutdown.h"
48 #include "chrome/browser/chrome_browser_main_extra_parts.h" 48 #include "chrome/browser/chrome_browser_main_extra_parts.h"
49 #include "chrome/browser/component_updater/component_updater_service.h" 49 #include "chrome/browser/component_updater/component_updater_service.h"
50 #include "chrome/browser/component_updater/flash_component_installer.h" 50 #include "chrome/browser/component_updater/flash_component_installer.h"
51 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" 51 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
52 #include "chrome/browser/component_updater/recovery_component_installer.h" 52 #include "chrome/browser/component_updater/recovery_component_installer.h"
53 #include "chrome/browser/component_updater/swiftshader_component_installer.h" 53 #include "chrome/browser/component_updater/swiftshader_component_installer.h"
54 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" 54 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
55 #include "chrome/browser/defaults.h" 55 #include "chrome/browser/defaults.h"
56 #include "chrome/browser/extensions/extension_protocols.h"
57 #include "chrome/browser/extensions/extension_service.h" 56 #include "chrome/browser/extensions/extension_service.h"
58 #include "chrome/browser/extensions/startup_helper.h" 57 #include "chrome/browser/extensions/startup_helper.h"
59 #include "chrome/browser/feedback/feedback_profile_observer.h" 58 #include "chrome/browser/feedback/feedback_profile_observer.h"
60 #include "chrome/browser/first_run/first_run.h" 59 #include "chrome/browser/first_run/first_run.h"
61 #include "chrome/browser/first_run/upgrade_util.h" 60 #include "chrome/browser/first_run/upgrade_util.h"
62 #include "chrome/browser/google/google_search_counter.h" 61 #include "chrome/browser/google/google_search_counter.h"
63 #include "chrome/browser/google/google_util.h" 62 #include "chrome/browser/google/google_util.h"
64 #include "chrome/browser/gpu/gl_string_manager.h" 63 #include "chrome/browser/gpu/gl_string_manager.h"
65 #include "chrome/browser/jankometer.h" 64 #include "chrome/browser/jankometer.h"
66 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 65 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 #include "components/translate/core/browser/translate_download_manager.h" 120 #include "components/translate/core/browser/translate_download_manager.h"
122 #include "content/public/browser/browser_thread.h" 121 #include "content/public/browser/browser_thread.h"
123 #include "content/public/browser/notification_observer.h" 122 #include "content/public/browser/notification_observer.h"
124 #include "content/public/browser/notification_registrar.h" 123 #include "content/public/browser/notification_registrar.h"
125 #include "content/public/browser/notification_service.h" 124 #include "content/public/browser/notification_service.h"
126 #include "content/public/browser/notification_types.h" 125 #include "content/public/browser/notification_types.h"
127 #include "content/public/browser/site_instance.h" 126 #include "content/public/browser/site_instance.h"
128 #include "content/public/common/content_client.h" 127 #include "content/public/common/content_client.h"
129 #include "content/public/common/content_switches.h" 128 #include "content/public/common/content_switches.h"
130 #include "content/public/common/main_function_params.h" 129 #include "content/public/common/main_function_params.h"
130 #include "extensions/browser/extension_protocols.h"
131 #include "extensions/browser/extension_system.h" 131 #include "extensions/browser/extension_system.h"
132 #include "grit/app_locale_settings.h" 132 #include "grit/app_locale_settings.h"
133 #include "grit/browser_resources.h" 133 #include "grit/browser_resources.h"
134 #include "grit/chromium_strings.h" 134 #include "grit/chromium_strings.h"
135 #include "grit/generated_resources.h" 135 #include "grit/generated_resources.h"
136 #include "grit/platform_locale_settings.h" 136 #include "grit/platform_locale_settings.h"
137 #include "net/base/net_module.h" 137 #include "net/base/net_module.h"
138 #include "net/base/sdch_manager.h" 138 #include "net/base/sdch_manager.h"
139 #include "net/cookies/cookie_monster.h" 139 #include "net/cookies/cookie_monster.h"
140 #include "net/http/http_network_layer.h" 140 #include "net/http/http_network_layer.h"
(...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1712 chromeos::CrosSettings::Shutdown(); 1712 chromeos::CrosSettings::Shutdown();
1713 #endif 1713 #endif
1714 #endif 1714 #endif
1715 } 1715 }
1716 1716
1717 // Public members: 1717 // Public members:
1718 1718
1719 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1719 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1720 chrome_extra_parts_.push_back(parts); 1720 chrome_extra_parts_.push_back(parts);
1721 } 1721 }
OLDNEW
« no previous file with comments | « apps/shell/browser/shell_extensions_browser_client.cc ('k') | chrome/browser/extensions/chrome_extensions_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698