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

Side by Side Diff: chrome/browser/extensions/extensions_service.cc

Issue 3359013: Revert 58809 - Implement the webNavigation.onCommitted event.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/extensions/extensions_service.h" 5 #include "chrome/browser/extensions/extensions_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/extensions/extension_browser_event_router.h" 27 #include "chrome/browser/extensions/extension_browser_event_router.h"
28 #include "chrome/browser/extensions/extension_cookies_api.h" 28 #include "chrome/browser/extensions/extension_cookies_api.h"
29 #include "chrome/browser/extensions/extension_data_deleter.h" 29 #include "chrome/browser/extensions/extension_data_deleter.h"
30 #include "chrome/browser/extensions/extension_dom_ui.h" 30 #include "chrome/browser/extensions/extension_dom_ui.h"
31 #include "chrome/browser/extensions/extension_error_reporter.h" 31 #include "chrome/browser/extensions/extension_error_reporter.h"
32 #include "chrome/browser/extensions/extension_history_api.h" 32 #include "chrome/browser/extensions/extension_history_api.h"
33 #include "chrome/browser/extensions/extension_host.h" 33 #include "chrome/browser/extensions/extension_host.h"
34 #include "chrome/browser/extensions/extension_management_api.h" 34 #include "chrome/browser/extensions/extension_management_api.h"
35 #include "chrome/browser/extensions/extension_process_manager.h" 35 #include "chrome/browser/extensions/extension_process_manager.h"
36 #include "chrome/browser/extensions/extension_updater.h" 36 #include "chrome/browser/extensions/extension_updater.h"
37 #include "chrome/browser/extensions/extension_webnavigation_api.h"
38 #include "chrome/browser/extensions/external_extension_provider.h" 37 #include "chrome/browser/extensions/external_extension_provider.h"
39 #include "chrome/browser/extensions/external_pref_extension_provider.h" 38 #include "chrome/browser/extensions/external_pref_extension_provider.h"
40 #include "chrome/browser/net/chrome_url_request_context.h" 39 #include "chrome/browser/net/chrome_url_request_context.h"
41 #include "chrome/browser/prefs/pref_service.h" 40 #include "chrome/browser/prefs/pref_service.h"
42 #include "chrome/browser/profile.h" 41 #include "chrome/browser/profile.h"
43 #include "chrome/browser/search_engines/template_url_model.h" 42 #include "chrome/browser/search_engines/template_url_model.h"
44 #include "chrome/browser/sync/glue/extension_sync_traits.h" 43 #include "chrome/browser/sync/glue/extension_sync_traits.h"
45 #include "chrome/browser/sync/glue/extension_util.h" 44 #include "chrome/browser/sync/glue/extension_util.h"
46 #include "chrome/common/child_process_logging.h" 45 #include "chrome/common/child_process_logging.h"
47 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 } 244 }
246 245
247 void ExtensionsService::InitEventRouters() { 246 void ExtensionsService::InitEventRouters() {
248 ExtensionHistoryEventRouter::GetInstance()->ObserveProfile(profile_); 247 ExtensionHistoryEventRouter::GetInstance()->ObserveProfile(profile_);
249 ExtensionAccessibilityEventRouter::GetInstance()->ObserveProfile(profile_); 248 ExtensionAccessibilityEventRouter::GetInstance()->ObserveProfile(profile_);
250 ExtensionBrowserEventRouter::GetInstance()->Init(profile_); 249 ExtensionBrowserEventRouter::GetInstance()->Init(profile_);
251 ExtensionBookmarkEventRouter::GetSingleton()->Observe( 250 ExtensionBookmarkEventRouter::GetSingleton()->Observe(
252 profile_->GetBookmarkModel()); 251 profile_->GetBookmarkModel());
253 ExtensionCookiesEventRouter::GetInstance()->Init(); 252 ExtensionCookiesEventRouter::GetInstance()->Init();
254 ExtensionManagementEventRouter::GetInstance()->Init(); 253 ExtensionManagementEventRouter::GetInstance()->Init();
255 ExtensionWebNavigationEventRouter::GetInstance()->Init();
256 } 254 }
257 255
258 void ExtensionsService::Init() { 256 void ExtensionsService::Init() {
259 DCHECK(!ready_); 257 DCHECK(!ready_);
260 DCHECK_EQ(extensions_.size(), 0u); 258 DCHECK_EQ(extensions_.size(), 0u);
261 259
262 // Hack: we need to ensure the ResourceDispatcherHost is ready before we load 260 // Hack: we need to ensure the ResourceDispatcherHost is ready before we load
263 // the first extension, because its members listen for loaded notifications. 261 // the first extension, because its members listen for loaded notifications.
264 g_browser_process->resource_dispatcher_host(); 262 g_browser_process->resource_dispatcher_host();
265 263
(...skipping 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1666 // Finish installing on UI thread. 1664 // Finish installing on UI thread.
1667 ChromeThread::PostTask( 1665 ChromeThread::PostTask(
1668 ChromeThread::UI, FROM_HERE, 1666 ChromeThread::UI, FROM_HERE,
1669 NewRunnableMethod( 1667 NewRunnableMethod(
1670 frontend_, 1668 frontend_,
1671 &ExtensionsService::ContinueLoadAllExtensions, 1669 &ExtensionsService::ContinueLoadAllExtensions,
1672 extensions_to_reload, 1670 extensions_to_reload,
1673 start_time, 1671 start_time,
1674 true)); 1672 true));
1675 } 1673 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_webnavigation_apitest.cc ('k') | chrome/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698