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

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

Issue 9583036: Revert 124817 - 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, 9 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) 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_devtools_bridge.h" 5 #include "chrome/browser/extensions/extension_devtools_bridge.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/extension_devtools_events.h" 12 #include "chrome/browser/extensions/extension_devtools_events.h"
13 #include "chrome/browser/extensions/extension_devtools_manager.h" 13 #include "chrome/browser/extensions/extension_devtools_manager.h"
14 #include "chrome/browser/extensions/extension_event_router.h" 14 #include "chrome/browser/extensions/extension_event_router.h"
15 #include "chrome/browser/extensions/extension_system.h"
16 #include "chrome/browser/extensions/extension_system_factory.h"
17 #include "chrome/browser/extensions/extension_tab_util.h" 15 #include "chrome/browser/extensions/extension_tab_util.h"
18 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
20 #include "content/public/browser/devtools_agent_host_registry.h" 18 #include "content/public/browser/devtools_agent_host_registry.h"
21 #include "content/public/browser/devtools_manager.h" 19 #include "content/public/browser/devtools_manager.h"
22 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
23 21
24 using content::DevToolsAgentHost; 22 using content::DevToolsAgentHost;
25 using content::DevToolsAgentHostRegistry; 23 using content::DevToolsAgentHostRegistry;
26 using content::DevToolsManager; 24 using content::DevToolsManager;
27 using content::WebContents; 25 using content::WebContents;
28 26
29 ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id, 27 ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id,
30 Profile* profile) 28 Profile* profile)
31 : tab_id_(tab_id), 29 : tab_id_(tab_id),
32 profile_(profile), 30 profile_(profile),
33 on_page_event_name_( 31 on_page_event_name_(
34 ExtensionDevToolsEvents::OnPageEventNameForTab(tab_id)), 32 ExtensionDevToolsEvents::OnPageEventNameForTab(tab_id)),
35 on_tab_close_event_name_( 33 on_tab_close_event_name_(
36 ExtensionDevToolsEvents::OnTabCloseEventNameForTab(tab_id)) { 34 ExtensionDevToolsEvents::OnTabCloseEventNameForTab(tab_id)) {
37 extension_devtools_manager_ = 35 extension_devtools_manager_ = profile_->GetExtensionDevToolsManager();
38 ExtensionSystemFactory::GetForProfile(profile)->devtools_manager();
39 DCHECK(extension_devtools_manager_.get()); 36 DCHECK(extension_devtools_manager_.get());
40 } 37 }
41 38
42 ExtensionDevToolsBridge::~ExtensionDevToolsBridge() { 39 ExtensionDevToolsBridge::~ExtensionDevToolsBridge() {
43 } 40 }
44 41
45 static std::string FormatDevToolsMessage(int id, const std::string& method) { 42 static std::string FormatDevToolsMessage(int id, const std::string& method) {
46 DictionaryValue message; 43 DictionaryValue message;
47 message.SetInteger("id", id); 44 message.SetInteger("id", id);
48 message.SetString("method", method); 45 message.SetString("method", method);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 117
121 std::string json = base::StringPrintf("[%s]", data.c_str()); 118 std::string json = base::StringPrintf("[%s]", data.c_str());
122 profile_->GetExtensionEventRouter()->DispatchEventToRenderers( 119 profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
123 on_page_event_name_, json, profile_, GURL()); 120 on_page_event_name_, json, profile_, GURL());
124 } 121 }
125 122
126 void ExtensionDevToolsBridge::TabReplaced(WebContents* new_tab) { 123 void ExtensionDevToolsBridge::TabReplaced(WebContents* new_tab) {
127 // We don't update the tab id as it needs to remain the same so that we can 124 // We don't update the tab id as it needs to remain the same so that we can
128 // properly unregister. 125 // properly unregister.
129 } 126 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/extension_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698