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

Unified Diff: chrome/browser/devtools/devtools_window.h

Issue 379963002: [WIP] Make extension APIs work in devtools APIs when docked. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/devtools_window.h
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
index 32b16768a3ad9f1156204b27ee6e944b169ebafe..ff67a946ad084ceaf1affa6b1f4758cd6567694c 100644
--- a/chrome/browser/devtools/devtools_window.h
+++ b/chrome/browser/devtools/devtools_window.h
@@ -5,11 +5,13 @@
#ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
#define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
+#include "base/memory/scoped_ptr.h"
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
#include "chrome/browser/devtools/devtools_toggle_action.h"
#include "chrome/browser/devtools/devtools_ui_bindings.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
+#include "extensions/browser/extension_function_dispatcher.h"
class Browser;
class BrowserWindow;
@@ -26,8 +28,10 @@ namespace user_prefs {
class PrefRegistrySyncable;
}
-class DevToolsWindow : public DevToolsUIBindings::Delegate,
- public content::WebContentsDelegate {
+class DevToolsWindow
+ : public DevToolsUIBindings::Delegate,
+ public content::WebContentsDelegate,
+ public extensions::ExtensionFunctionDispatcher::Delegate {
pfeldman 2014/07/10 13:44:36 You probably want to add this aspect to DevToolsUI
public:
class ObserverWithAccessor : public content::WebContentsObserver {
public:
@@ -286,6 +290,12 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
virtual InfoBarService* GetInfoBarService() OVERRIDE;
virtual void RenderProcessGone() OVERRIDE;
+ // extensions::ExtensionFunctionDispatcher::Delegate overrides
+ virtual extensions::WindowController* GetExtensionWindowController()
+ const OVERRIDE;
+ virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
+ virtual content::WebContents* GetVisibleWebContents() const OVERRIDE;
+
void CreateDevToolsBrowser();
BrowserWindow* GetInspectedBrowserWindow();
void ScheduleShow(const DevToolsToggleAction& action);
@@ -318,6 +328,8 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
base::TimeTicks inspect_element_start_time_;
scoped_ptr<DevToolsEventForwarder> event_forwarder_;
+ scoped_ptr<extensions::ExtensionFunctionDispatcher> extension_dispatcher_;
+
friend class DevToolsEventForwarder;
DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
};
« no previous file with comments | « no previous file | chrome/browser/devtools/devtools_window.cc » ('j') | chrome/browser/devtools/devtools_window.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698