summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger/devtools_window.h
diff options
context:
space:
mode:
authoradriansc@google.com <adriansc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 00:22:50 +0000
committeradriansc@google.com <adriansc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 00:22:50 +0000
commit00c37fc410f0e5e95d484e4438de1d9db3c4650d (patch)
treeb69cba92b71ccf60efc301d32335bdf0fb5dceb8 /chrome/browser/debugger/devtools_window.h
parent45f755852391c7601688880ddf313c3e78d043e2 (diff)
downloadchromium_src-00c37fc410f0e5e95d484e4438de1d9db3c4650d.zip
chromium_src-00c37fc410f0e5e95d484e4438de1d9db3c4650d.tar.gz
chromium_src-00c37fc410f0e5e95d484e4438de1d9db3c4650d.tar.bz2
This is only the first part of the refactoring. The old method was preserved
and not all call points were changed. The second part will deal with factoring out the old OpenURL method. Overall purpose: speed up calls, make it more flexible to plumb parameters to the call chain, reduce code repetition. It is necessary to add one more parameter (namely, override_encoding) to OpenURL in order to be able to restore the page encoding upon loading the contents. For solving this issue, it is necessary for the encoding to be restored from the BookmarkModel. BUG=2926 Review URL: http://codereview.chromium.org/7388007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_window.h')
-rw-r--r--chrome/browser/debugger/devtools_window.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index 569a747..6565bf6 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -90,12 +90,15 @@ class DevToolsWindow
void CallClientFunction(const string16& function_name,
const base::Value& arg);
// Overridden from TabContentsDelegate.
+ // Deprecated. Use two-arguments variant instead.
virtual TabContents* OpenURLFromTab(
TabContents* source,
const GURL& url,
const GURL& referrer,
WindowOpenDisposition disposition,
- PageTransition::Type transition);
+ PageTransition::Type transition) OVERRIDE;
+ virtual TabContents* OpenURLFromTab(TabContents* source,
+ const OpenURLParams& params) OVERRIDE;
virtual void AddNewContents(TabContents* source,
TabContents* new_contents,
WindowOpenDisposition disposition,