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

Side by Side Diff: chrome/browser/automation/automation_provider.cc

Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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) 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/automation/automation_provider.h" 5 #include "chrome/browser/automation/automation_provider.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/browser_process.h" 40 #include "chrome/browser/browser_process.h"
41 #include "chrome/browser/browsing_data_remover.h" 41 #include "chrome/browser/browsing_data_remover.h"
42 #include "chrome/browser/character_encoding.h" 42 #include "chrome/browser/character_encoding.h"
43 #include "chrome/browser/content_settings/host_content_settings_map.h" 43 #include "chrome/browser/content_settings/host_content_settings_map.h"
44 #include "chrome/browser/extensions/crx_installer.h" 44 #include "chrome/browser/extensions/crx_installer.h"
45 #include "chrome/browser/extensions/extension_browser_event_router.h" 45 #include "chrome/browser/extensions/extension_browser_event_router.h"
46 #include "chrome/browser/extensions/extension_host.h" 46 #include "chrome/browser/extensions/extension_host.h"
47 #include "chrome/browser/extensions/extension_install_ui.h" 47 #include "chrome/browser/extensions/extension_install_ui.h"
48 #include "chrome/browser/extensions/extension_message_service.h" 48 #include "chrome/browser/extensions/extension_message_service.h"
49 #include "chrome/browser/extensions/extension_service.h" 49 #include "chrome/browser/extensions/extension_service.h"
50 #include "chrome/browser/extensions/extension_system.h"
51 #include "chrome/browser/extensions/extension_system_factory.h"
50 #include "chrome/browser/extensions/extension_tab_util.h" 52 #include "chrome/browser/extensions/extension_tab_util.h"
51 #include "chrome/browser/extensions/extension_toolbar_model.h" 53 #include "chrome/browser/extensions/extension_toolbar_model.h"
52 #include "chrome/browser/extensions/unpacked_installer.h" 54 #include "chrome/browser/extensions/unpacked_installer.h"
53 #include "chrome/browser/extensions/user_script_master.h" 55 #include "chrome/browser/extensions/user_script_master.h"
54 #include "chrome/browser/net/url_request_mock_util.h" 56 #include "chrome/browser/net/url_request_mock_util.h"
55 #include "chrome/browser/prefs/pref_service.h" 57 #include "chrome/browser/prefs/pref_service.h"
56 #include "chrome/browser/printing/print_job.h" 58 #include "chrome/browser/printing/print_job.h"
57 #include "chrome/browser/profiles/profile_manager.h" 59 #include "chrome/browser/profiles/profile_manager.h"
58 #include "chrome/browser/ssl/ssl_blocking_page.h" 60 #include "chrome/browser/ssl/ssl_blocking_page.h"
59 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" 61 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 } 910 }
909 } 911 }
910 912
911 void AutomationProvider::ExecuteExtensionActionInActiveTabAsync( 913 void AutomationProvider::ExecuteExtensionActionInActiveTabAsync(
912 int extension_handle, int browser_handle, 914 int extension_handle, int browser_handle,
913 IPC::Message* reply_message) { 915 IPC::Message* reply_message) {
914 bool success = false; 916 bool success = false;
915 const Extension* extension = GetEnabledExtension(extension_handle); 917 const Extension* extension = GetEnabledExtension(extension_handle);
916 ExtensionService* service = profile_->GetExtensionService(); 918 ExtensionService* service = profile_->GetExtensionService();
917 ExtensionMessageService* message_service = 919 ExtensionMessageService* message_service =
918 profile_->GetExtensionMessageService(); 920 ExtensionSystemFactory::GetForProfile(profile_)->message_service();
919 Browser* browser = browser_tracker_->GetResource(browser_handle); 921 Browser* browser = browser_tracker_->GetResource(browser_handle);
920 if (extension && service && message_service && browser) { 922 if (extension && service && message_service && browser) {
921 int tab_id = ExtensionTabUtil::GetTabId(browser->GetSelectedWebContents()); 923 int tab_id = ExtensionTabUtil::GetTabId(browser->GetSelectedWebContents());
922 if (extension->page_action()) { 924 if (extension->page_action()) {
923 service->browser_event_router()->PageActionExecuted( 925 service->browser_event_router()->PageActionExecuted(
924 browser->profile(), extension->id(), "action", tab_id, "", 1); 926 browser->profile(), extension->id(), "action", tab_id, "", 1);
925 success = true; 927 success = true;
926 } else if (extension->browser_action()) { 928 } else if (extension->browser_action()) {
927 service->browser_event_router()->BrowserActionExecuted( 929 service->browser_event_router()->BrowserActionExecuted(
928 browser->profile(), extension->id(), browser); 930 browser->profile(), extension->id(), browser);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 } 1004 }
1003 } 1005 }
1004 } 1006 }
1005 1007
1006 void AutomationProvider::SaveAsAsync(int tab_handle) { 1008 void AutomationProvider::SaveAsAsync(int tab_handle) {
1007 NavigationController* tab = NULL; 1009 NavigationController* tab = NULL;
1008 WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab); 1010 WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab);
1009 if (web_contents) 1011 if (web_contents)
1010 web_contents->OnSavePage(); 1012 web_contents->OnSavePage();
1011 } 1013 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/extensions/extension_system_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698