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

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

Issue 11638024: Make MediaPlayerEventRouter a PKS to decouple it from ExtensionService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years 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/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <set> 9 #include <set>
10 10
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #include "grit/generated_resources.h" 106 #include "grit/generated_resources.h"
107 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 107 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
108 #include "sync/api/sync_change.h" 108 #include "sync/api/sync_change.h"
109 #include "sync/api/sync_error_factory.h" 109 #include "sync/api/sync_error_factory.h"
110 #include "webkit/database/database_tracker.h" 110 #include "webkit/database/database_tracker.h"
111 #include "webkit/database/database_util.h" 111 #include "webkit/database/database_util.h"
112 112
113 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
114 #include "chrome/browser/chromeos/cros/cros_library.h" 114 #include "chrome/browser/chromeos/cros/cros_library.h"
115 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" 115 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
116 #include "chrome/browser/chromeos/extensions/media_player_event_router.h" 116 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
Yoyo Zhou 2012/12/20 22:45:20 remove this also
Joe Thomas 2012/12/20 23:20:28 Done.
117 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 117 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
118 #include "content/public/browser/storage_partition.h" 118 #include "content/public/browser/storage_partition.h"
119 #include "webkit/fileapi/file_system_context.h" 119 #include "webkit/fileapi/file_system_context.h"
120 #include "webkit/fileapi/file_system_mount_point_provider.h" 120 #include "webkit/fileapi/file_system_mount_point_provider.h"
121 #endif 121 #endif
122 122
123 using content::BrowserContext; 123 using content::BrowserContext;
124 using content::BrowserThread; 124 using content::BrowserThread;
125 using content::DevToolsAgentHost; 125 using content::DevToolsAgentHost;
126 using content::DevToolsAgentHostRegistry; 126 using content::DevToolsAgentHostRegistry;
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 return; 521 return;
522 522
523 #if defined(ENABLE_EXTENSIONS) 523 #if defined(ENABLE_EXTENSIONS)
524 browser_event_router_.reset(new extensions::BrowserEventRouter(profile_)); 524 browser_event_router_.reset(new extensions::BrowserEventRouter(profile_));
525 525
526 extensions::PushMessagingAPIFactory::GetForProfile(profile_); 526 extensions::PushMessagingAPIFactory::GetForProfile(profile_);
527 527
528 #if defined(OS_CHROMEOS) 528 #if defined(OS_CHROMEOS)
529 FileBrowserEventRouterFactory::GetForProfile( 529 FileBrowserEventRouterFactory::GetForProfile(
530 profile_)->ObserveFileSystemEvents(); 530 profile_)->ObserveFileSystemEvents();
531
532 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
533 #endif // defined(OS_CHROMEOS) 531 #endif // defined(OS_CHROMEOS)
534 #endif // defined(ENABLE_EXTENSIONS) 532 #endif // defined(ENABLE_EXTENSIONS)
535 event_routers_initialized_ = true; 533 event_routers_initialized_ = true;
536 } 534 }
537 535
538 void ExtensionService::Shutdown() { 536 void ExtensionService::Shutdown() {
539 // Do nothing for now. 537 // Do nothing for now.
540 } 538 }
541 539
542 const Extension* ExtensionService::GetExtensionById( 540 const Extension* ExtensionService::GetExtensionById(
(...skipping 2587 matching lines...) Expand 10 before | Expand all | Expand 10 after
3130 scoped_refptr<const Extension> extension = GetInstalledExtension(*it); 3128 scoped_refptr<const Extension> extension = GetInstalledExtension(*it);
3131 DCHECK(extension); 3129 DCHECK(extension);
3132 if (!extension) 3130 if (!extension)
3133 continue; 3131 continue;
3134 blacklisted_extensions_.Insert(extension); 3132 blacklisted_extensions_.Insert(extension);
3135 UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST); 3133 UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
3136 } 3134 }
3137 3135
3138 IdentifyAlertableExtensions(); 3136 IdentifyAlertableExtensions();
3139 } 3137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698