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

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: Resolved conflicts. Created 9 years, 6 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 management_event_router_->Init(); 559 management_event_router_->Init();
559 processes_event_router_.reset(new ExtensionProcessesEventRouter(profile_)); 560 processes_event_router_.reset(new ExtensionProcessesEventRouter(profile_));
560 processes_event_router_->Init(); 561 processes_event_router_->Init();
561 web_navigation_event_router_.reset(new ExtensionWebNavigationEventRouter()); 562 web_navigation_event_router_.reset(new ExtensionWebNavigationEventRouter());
562 web_navigation_event_router_->Init(); 563 web_navigation_event_router_->Init();
563 564
564 #if defined(OS_CHROMEOS) 565 #if defined(OS_CHROMEOS)
565 file_browser_event_router_.reset( 566 file_browser_event_router_.reset(
566 new ExtensionFileBrowserEventRouter(profile_)); 567 new ExtensionFileBrowserEventRouter(profile_));
567 file_browser_event_router_->ObserveFileSystemEvents(); 568 file_browser_event_router_->ObserveFileSystemEvents();
569 ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
568 #endif 570 #endif
569 571
570 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) 572 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
571 ExtensionInputUiEventRouter::GetInstance()->Init(); 573 ExtensionInputUiEventRouter::GetInstance()->Init();
572 #endif 574 #endif
573 575
574 event_routers_initialized_ = true; 576 event_routers_initialized_ = true;
575 } 577 }
576 578
577 const Extension* ExtensionService::GetExtensionById( 579 const Extension* ExtensionService::GetExtensionById(
(...skipping 1678 matching lines...) Expand 10 before | Expand all | Expand 10 after
2256 2258
2257 ExtensionService::NaClModuleInfoList::iterator 2259 ExtensionService::NaClModuleInfoList::iterator
2258 ExtensionService::FindNaClModule(const GURL& url) { 2260 ExtensionService::FindNaClModule(const GURL& url) {
2259 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 2261 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
2260 iter != nacl_module_list_.end(); ++iter) { 2262 iter != nacl_module_list_.end(); ++iter) {
2261 if (iter->url == url) 2263 if (iter->url == url)
2262 return iter; 2264 return iter;
2263 } 2265 }
2264 return nacl_module_list_.end(); 2266 return nacl_module_list_.end();
2265 } 2267 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_mediaplayer_private_api.cc ('k') | chrome/browser/extensions/file_manager_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698