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

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

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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
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_DEVTOOLS_DEVTOOLS_WINDOW_H_ 5 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
6 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ 6 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
7 7
8 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" 8 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
9 #include "chrome/browser/devtools/devtools_toggle_action.h" 9 #include "chrome/browser/devtools/devtools_toggle_action.h"
10 #include "chrome/browser/devtools/devtools_ui_bindings.h" 10 #include "chrome/browser/devtools/devtools_ui_bindings.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile); 221 static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile);
222 static DevToolsWindow* ToggleDevToolsWindow( 222 static DevToolsWindow* ToggleDevToolsWindow(
223 content::WebContents* web_contents, 223 content::WebContents* web_contents,
224 bool force_open, 224 bool force_open,
225 const DevToolsToggleAction& action, 225 const DevToolsToggleAction& action,
226 const std::string& settings); 226 const std::string& settings);
227 227
228 // content::WebContentsDelegate: 228 // content::WebContentsDelegate:
229 virtual content::WebContents* OpenURLFromTab( 229 virtual content::WebContents* OpenURLFromTab(
230 content::WebContents* source, 230 content::WebContents* source,
231 const content::OpenURLParams& params) OVERRIDE; 231 const content::OpenURLParams& params) override;
232 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; 232 virtual void ActivateContents(content::WebContents* contents) override;
233 virtual void AddNewContents(content::WebContents* source, 233 virtual void AddNewContents(content::WebContents* source,
234 content::WebContents* new_contents, 234 content::WebContents* new_contents,
235 WindowOpenDisposition disposition, 235 WindowOpenDisposition disposition,
236 const gfx::Rect& initial_pos, 236 const gfx::Rect& initial_pos,
237 bool user_gesture, 237 bool user_gesture,
238 bool* was_blocked) OVERRIDE; 238 bool* was_blocked) override;
239 virtual void WebContentsCreated(content::WebContents* source_contents, 239 virtual void WebContentsCreated(content::WebContents* source_contents,
240 int opener_render_frame_id, 240 int opener_render_frame_id,
241 const base::string16& frame_name, 241 const base::string16& frame_name,
242 const GURL& target_url, 242 const GURL& target_url,
243 content::WebContents* new_contents) OVERRIDE; 243 content::WebContents* new_contents) override;
244 virtual void CloseContents(content::WebContents* source) OVERRIDE; 244 virtual void CloseContents(content::WebContents* source) override;
245 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 245 virtual void ContentsZoomChange(bool zoom_in) override;
246 virtual void BeforeUnloadFired(content::WebContents* tab, 246 virtual void BeforeUnloadFired(content::WebContents* tab,
247 bool proceed, 247 bool proceed,
248 bool* proceed_to_fire_unload) OVERRIDE; 248 bool* proceed_to_fire_unload) override;
249 virtual bool PreHandleKeyboardEvent( 249 virtual bool PreHandleKeyboardEvent(
250 content::WebContents* source, 250 content::WebContents* source,
251 const content::NativeWebKeyboardEvent& event, 251 const content::NativeWebKeyboardEvent& event,
252 bool* is_keyboard_shortcut) OVERRIDE; 252 bool* is_keyboard_shortcut) override;
253 virtual void HandleKeyboardEvent( 253 virtual void HandleKeyboardEvent(
254 content::WebContents* source, 254 content::WebContents* source,
255 const content::NativeWebKeyboardEvent& event) OVERRIDE; 255 const content::NativeWebKeyboardEvent& event) override;
256 virtual content::JavaScriptDialogManager* 256 virtual content::JavaScriptDialogManager*
257 GetJavaScriptDialogManager() OVERRIDE; 257 GetJavaScriptDialogManager() override;
258 virtual content::ColorChooser* OpenColorChooser( 258 virtual content::ColorChooser* OpenColorChooser(
259 content::WebContents* web_contents, 259 content::WebContents* web_contents,
260 SkColor color, 260 SkColor color,
261 const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; 261 const std::vector<content::ColorSuggestion>& suggestions) override;
262 virtual void RunFileChooser( 262 virtual void RunFileChooser(
263 content::WebContents* web_contents, 263 content::WebContents* web_contents,
264 const content::FileChooserParams& params) OVERRIDE; 264 const content::FileChooserParams& params) override;
265 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; 265 virtual void WebContentsFocused(content::WebContents* contents) override;
266 virtual bool PreHandleGestureEvent( 266 virtual bool PreHandleGestureEvent(
267 content::WebContents* source, 267 content::WebContents* source,
268 const blink::WebGestureEvent& event) OVERRIDE; 268 const blink::WebGestureEvent& event) override;
269 269
270 // content::DevToolsUIBindings::Delegate overrides 270 // content::DevToolsUIBindings::Delegate overrides
271 virtual void ActivateWindow() OVERRIDE; 271 virtual void ActivateWindow() override;
272 virtual void CloseWindow() OVERRIDE; 272 virtual void CloseWindow() override;
273 virtual void SetInspectedPageBounds(const gfx::Rect& rect) OVERRIDE; 273 virtual void SetInspectedPageBounds(const gfx::Rect& rect) override;
274 virtual void InspectElementCompleted() OVERRIDE; 274 virtual void InspectElementCompleted() override;
275 virtual void MoveWindow(int x, int y) OVERRIDE; 275 virtual void MoveWindow(int x, int y) override;
276 virtual void SetIsDocked(bool is_docked) OVERRIDE; 276 virtual void SetIsDocked(bool is_docked) override;
277 virtual void OpenInNewTab(const std::string& url) OVERRIDE; 277 virtual void OpenInNewTab(const std::string& url) override;
278 virtual void SetWhitelistedShortcuts(const std::string& message) OVERRIDE; 278 virtual void SetWhitelistedShortcuts(const std::string& message) override;
279 virtual void InspectedContentsClosing() OVERRIDE; 279 virtual void InspectedContentsClosing() override;
280 virtual void OnLoadCompleted() OVERRIDE; 280 virtual void OnLoadCompleted() override;
281 virtual InfoBarService* GetInfoBarService() OVERRIDE; 281 virtual InfoBarService* GetInfoBarService() override;
282 virtual void RenderProcessGone() OVERRIDE; 282 virtual void RenderProcessGone() override;
283 283
284 void CreateDevToolsBrowser(); 284 void CreateDevToolsBrowser();
285 BrowserWindow* GetInspectedBrowserWindow(); 285 BrowserWindow* GetInspectedBrowserWindow();
286 void ScheduleShow(const DevToolsToggleAction& action); 286 void ScheduleShow(const DevToolsToggleAction& action);
287 void Show(const DevToolsToggleAction& action); 287 void Show(const DevToolsToggleAction& action);
288 void DoAction(const DevToolsToggleAction& action); 288 void DoAction(const DevToolsToggleAction& action);
289 void LoadCompleted(); 289 void LoadCompleted();
290 void UpdateBrowserToolbar(); 290 void UpdateBrowserToolbar();
291 void UpdateBrowserWindow(); 291 void UpdateBrowserWindow();
292 content::WebContents* GetInspectedWebContents(); 292 content::WebContents* GetInspectedWebContents();
(...skipping 17 matching lines...) Expand all
310 base::Closure close_callback_; 310 base::Closure close_callback_;
311 311
312 base::TimeTicks inspect_element_start_time_; 312 base::TimeTicks inspect_element_start_time_;
313 scoped_ptr<DevToolsEventForwarder> event_forwarder_; 313 scoped_ptr<DevToolsEventForwarder> event_forwarder_;
314 314
315 friend class DevToolsEventForwarder; 315 friend class DevToolsEventForwarder;
316 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); 316 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
317 }; 317 };
318 318
319 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ 319 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_ui_bindings.cc ('k') | chrome/browser/devtools/devtools_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698