Index: chrome/browser/devtools/devtools_window.h |
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h |
index 63922fc96130205204ea5d56b89304950a57d54d..d0a4d3b0b2f6fa4f1ef40cdb3f906126713899a2 100644 |
--- a/chrome/browser/devtools/devtools_window.h |
+++ b/chrome/browser/devtools/devtools_window.h |
@@ -61,6 +61,7 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate, |
DevToolsContentsResizingStrategy* out_strategy); |
static bool IsDevToolsWindow(content::WebContents* web_contents); |
+ static DevToolsWindow* AsDevToolsWindow(content::WebContents* web_contents); |
// Open or reveal DevTools window, and perform the specified action. |
static DevToolsWindow* OpenDevToolsWindow( |
@@ -100,6 +101,11 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate, |
// Forwards an unhandled keyboard event to the DevTools frontend. |
bool ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& event); |
+ // content::WebContentsDelegate overrides. |
+ content::WebContents* OpenURLFromTab( |
+ content::WebContents* source, |
+ const content::OpenURLParams& params) override; |
+ |
// BeforeUnload interception //////////////////////////////////////////////// |
// In order to preserve any edits the user may have made in devtools, the |
@@ -218,7 +224,6 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate, |
bool can_dock, |
const std::string& settings); |
static DevToolsWindow* FindDevToolsWindow(content::DevToolsAgentHost*); |
- static DevToolsWindow* AsDevToolsWindow(content::WebContents*); |
static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile); |
static DevToolsWindow* ToggleDevToolsWindow( |
content::WebContents* web_contents, |
@@ -227,9 +232,6 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate, |
const std::string& settings); |
// content::WebContentsDelegate: |
- content::WebContents* OpenURLFromTab( |
- content::WebContents* source, |
- const content::OpenURLParams& params) override; |
void ActivateContents(content::WebContents* contents) override; |
void AddNewContents(content::WebContents* source, |
content::WebContents* new_contents, |