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

Side by Side Diff: chrome/browser/debugger/devtools_window.h

Issue 10825217: Revert "Make F12 close an undocked DevTools window rather than open another DevTools window for thi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/debugger/devtools_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 5 #ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
6 #define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 6 #define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 content::WebContents* web_contents, 125 content::WebContents* web_contents,
126 const content::FileChooserParams& params) OVERRIDE; 126 const content::FileChooserParams& params) OVERRIDE;
127 127
128 virtual void FrameNavigating(const std::string& url) OVERRIDE {} 128 virtual void FrameNavigating(const std::string& url) OVERRIDE {}
129 129
130 static DevToolsWindow* ToggleDevToolsWindow( 130 static DevToolsWindow* ToggleDevToolsWindow(
131 content::RenderViewHost* inspected_rvh, 131 content::RenderViewHost* inspected_rvh,
132 bool force_open, 132 bool force_open,
133 DevToolsToggleAction action); 133 DevToolsToggleAction action);
134 static DevToolsWindow* AsDevToolsWindow(content::DevToolsClientHost*); 134 static DevToolsWindow* AsDevToolsWindow(content::DevToolsClientHost*);
135 static DevToolsWindow* AsDevToolsWindow(content::RenderViewHost*);
136 135
137 // content::DevToolsClientHandlerDelegate overrides. 136 // content::DevToolsClientHandlerDelegate overrides.
138 virtual void ActivateWindow() OVERRIDE; 137 virtual void ActivateWindow() OVERRIDE;
139 virtual void CloseWindow() OVERRIDE; 138 virtual void CloseWindow() OVERRIDE;
140 virtual void MoveWindow(int x, int y) OVERRIDE; 139 virtual void MoveWindow(int x, int y) OVERRIDE;
141 virtual void DockWindow() OVERRIDE; 140 virtual void DockWindow() OVERRIDE;
142 virtual void UndockWindow() OVERRIDE; 141 virtual void UndockWindow() OVERRIDE;
143 virtual void SetDockSide(const std::string& side) OVERRIDE; 142 virtual void SetDockSide(const std::string& side) OVERRIDE;
144 virtual void OpenInNewTab(const std::string& url) OVERRIDE; 143 virtual void OpenInNewTab(const std::string& url) OVERRIDE;
145 virtual void SaveToFile(const std::string& url, 144 virtual void SaveToFile(const std::string& url,
(...skipping 17 matching lines...) Expand all
163 bool docked_; 162 bool docked_;
164 bool is_loaded_; 163 bool is_loaded_;
165 DevToolsToggleAction action_on_load_; 164 DevToolsToggleAction action_on_load_;
166 content::NotificationRegistrar registrar_; 165 content::NotificationRegistrar registrar_;
167 content::DevToolsClientHost* frontend_host_; 166 content::DevToolsClientHost* frontend_host_;
168 scoped_ptr<DevToolsFileHelper> file_helper_; 167 scoped_ptr<DevToolsFileHelper> file_helper_;
169 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); 168 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
170 }; 169 };
171 170
172 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 171 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/debugger/devtools_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698