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

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
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 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 input_method_event_router_.reset( 551 input_method_event_router_.reset(
552 new chromeos::ExtensionInputMethodEventRouter); 552 new chromeos::ExtensionInputMethodEventRouter);
553 553
554 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_); 554 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
555 extensions::InputImeEventRouter::GetInstance()->Init(); 555 extensions::InputImeEventRouter::GetInstance()->Init();
556 #endif // defined(OS_CHROMEOS) 556 #endif // defined(OS_CHROMEOS)
557 #endif // defined(ENABLE_EXTENSIONS) 557 #endif // defined(ENABLE_EXTENSIONS)
558 event_routers_initialized_ = true; 558 event_routers_initialized_ = true;
559 } 559 }
560 560
561 void ExtensionService::NotifyExtensionEventRouters(
562 const std::string& event_name) {
563 bluetooth_event_router_->OnEventListenerAdded(event_name);
564 }
565
561 void ExtensionService::OnProfileSyncServiceShutdown() { 566 void ExtensionService::OnProfileSyncServiceShutdown() {
562 // TODO(akalin): Move this block to Shutdown() once 567 // TODO(akalin): Move this block to Shutdown() once
563 // http://crbug.com/153827 is fixed. 568 // http://crbug.com/153827 is fixed.
564 if (push_messaging_event_router_.get()) 569 if (push_messaging_event_router_.get())
565 push_messaging_event_router_->Shutdown(); 570 push_messaging_event_router_->Shutdown();
566 } 571 }
567 572
568 void ExtensionService::Shutdown() { 573 void ExtensionService::Shutdown() {
569 // Do nothing for now. 574 // Do nothing for now.
570 } 575 }
(...skipping 2288 matching lines...) Expand 10 before | Expand all | Expand 10 after
2859 // External extensions are initially disabled. We prompt the user before 2864 // External extensions are initially disabled. We prompt the user before
2860 // enabling them. 2865 // enabling them.
2861 if (Extension::IsExternalLocation(extension->location()) && 2866 if (Extension::IsExternalLocation(extension->location()) &&
2862 !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) { 2867 !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) {
2863 return false; 2868 return false;
2864 } 2869 }
2865 } 2870 }
2866 2871
2867 return true; 2872 return true;
2868 } 2873 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698