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

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

Issue 11369055: Delayed adding BluetoothEventRouter as BluetoothAdapter observer until when the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed BluetoothApiTest. Created 8 years, 1 month 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
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 input_method_event_router_.reset( 542 input_method_event_router_.reset(
543 new chromeos::ExtensionInputMethodEventRouter); 543 new chromeos::ExtensionInputMethodEventRouter);
544 544
545 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_); 545 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
546 extensions::InputImeEventRouter::GetInstance()->Init(); 546 extensions::InputImeEventRouter::GetInstance()->Init();
547 #endif // defined(OS_CHROMEOS) 547 #endif // defined(OS_CHROMEOS)
548 #endif // defined(ENABLE_EXTENSIONS) 548 #endif // defined(ENABLE_EXTENSIONS)
549 event_routers_initialized_ = true; 549 event_routers_initialized_ = true;
550 } 550 }
551 551
552 void ExtensionService::NotifyExtensionEventRouters(
553 const std::string& event_name) {
554 bluetooth_event_router_->OnEventListenerAdded(event_name);
555 }
556
552 void ExtensionService::OnProfileSyncServiceShutdown() { 557 void ExtensionService::OnProfileSyncServiceShutdown() {
553 // TODO(akalin): Move this block to Shutdown() once 558 // TODO(akalin): Move this block to Shutdown() once
554 // http://crbug.com/153827 is fixed. 559 // http://crbug.com/153827 is fixed.
555 if (push_messaging_event_router_.get()) 560 if (push_messaging_event_router_.get())
556 push_messaging_event_router_->Shutdown(); 561 push_messaging_event_router_->Shutdown();
557 } 562 }
558 563
559 void ExtensionService::Shutdown() { 564 void ExtensionService::Shutdown() {
560 // Do nothing for now. 565 // Do nothing for now.
561 } 566 }
(...skipping 2288 matching lines...) Expand 10 before | Expand all | Expand 10 after
2850 // External extensions are initially disabled. We prompt the user before 2855 // External extensions are initially disabled. We prompt the user before
2851 // enabling them. 2856 // enabling them.
2852 if (Extension::IsExternalLocation(extension->location()) && 2857 if (Extension::IsExternalLocation(extension->location()) &&
2853 !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) { 2858 !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) {
2854 return false; 2859 return false;
2855 } 2860 }
2856 } 2861 }
2857 2862
2858 return true; 2863 return true;
2859 } 2864 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698