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

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

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed style errors and localized strings. Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "content/common/notification_type.h" 77 #include "content/common/notification_type.h"
78 #include "content/common/pepper_plugin_registry.h" 78 #include "content/common/pepper_plugin_registry.h"
79 #include "googleurl/src/gurl.h" 79 #include "googleurl/src/gurl.h"
80 #include "net/base/registry_controlled_domain.h" 80 #include "net/base/registry_controlled_domain.h"
81 #include "webkit/database/database_tracker.h" 81 #include "webkit/database/database_tracker.h"
82 #include "webkit/database/database_util.h" 82 #include "webkit/database/database_util.h"
83 #include "webkit/plugins/npapi/plugin_list.h" 83 #include "webkit/plugins/npapi/plugin_list.h"
84 84
85 #if defined(OS_CHROMEOS) 85 #if defined(OS_CHROMEOS)
86 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" 86 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
87 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
87 #include "webkit/fileapi/file_system_context.h" 88 #include "webkit/fileapi/file_system_context.h"
88 #include "webkit/fileapi/file_system_mount_point_provider.h" 89 #include "webkit/fileapi/file_system_mount_point_provider.h"
89 #include "webkit/fileapi/file_system_path_manager.h" 90 #include "webkit/fileapi/file_system_path_manager.h"
90 #endif 91 #endif
91 92
92 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) 93 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
93 #include "chrome/browser/extensions/extension_input_ui_api.h" 94 #include "chrome/browser/extensions/extension_input_ui_api.h"
94 #endif 95 #endif
95 96
96 using base::Time; 97 using base::Time;
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 ExtensionBookmarkEventRouter::GetInstance()->Observe( 591 ExtensionBookmarkEventRouter::GetInstance()->Observe(
591 profile_->GetBookmarkModel()); 592 profile_->GetBookmarkModel());
592 ExtensionCookiesEventRouter::GetInstance()->Init(); 593 ExtensionCookiesEventRouter::GetInstance()->Init();
593 ExtensionManagementEventRouter::GetInstance()->Init(); 594 ExtensionManagementEventRouter::GetInstance()->Init();
594 ExtensionProcessesEventRouter::GetInstance()->ObserveProfile(profile_); 595 ExtensionProcessesEventRouter::GetInstance()->ObserveProfile(profile_);
595 ExtensionWebNavigationEventRouter::GetInstance()->Init(); 596 ExtensionWebNavigationEventRouter::GetInstance()->Init();
596 597
597 #if defined(OS_CHROMEOS) 598 #if defined(OS_CHROMEOS)
598 ExtensionFileBrowserEventRouter::GetInstance()->ObserveFileSystemEvents( 599 ExtensionFileBrowserEventRouter::GetInstance()->ObserveFileSystemEvents(
599 profile_); 600 profile_);
601 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
600 #endif 602 #endif
601 603
602 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) 604 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
603 ExtensionInputUiEventRouter::GetInstance()->Init(); 605 ExtensionInputUiEventRouter::GetInstance()->Init();
604 #endif 606 #endif
605 607
606 event_routers_initialized_ = true; 608 event_routers_initialized_ = true;
607 } 609 }
608 610
609 const Extension* ExtensionService::GetExtensionById( 611 const Extension* ExtensionService::GetExtensionById(
(...skipping 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
2267 2269
2268 ExtensionService::NaClModuleInfoList::iterator 2270 ExtensionService::NaClModuleInfoList::iterator
2269 ExtensionService::FindNaClModule(const GURL& url) { 2271 ExtensionService::FindNaClModule(const GURL& url) {
2270 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 2272 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
2271 iter != nacl_module_list_.end(); ++iter) { 2273 iter != nacl_module_list_.end(); ++iter) {
2272 if (iter->url == url) 2274 if (iter->url == url)
2273 return iter; 2275 return iter;
2274 } 2276 }
2275 return nacl_module_list_.end(); 2277 return nacl_module_list_.end();
2276 } 2278 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698