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

Side by Side Diff: chrome/browser/devtools/devtools_ui_bindings.cc

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "chrome/browser/devtools/devtools_ui_bindings.h" 5 #include "chrome/browser/devtools/devtools_ui_bindings.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 static void Create(InfoBarService* infobar_service, 110 static void Create(InfoBarService* infobar_service,
111 const InfoBarCallback& callback, 111 const InfoBarCallback& callback,
112 const base::string16& message); 112 const base::string16& message);
113 113
114 private: 114 private:
115 DevToolsConfirmInfoBarDelegate( 115 DevToolsConfirmInfoBarDelegate(
116 const InfoBarCallback& callback, 116 const InfoBarCallback& callback,
117 const base::string16& message); 117 const base::string16& message);
118 virtual ~DevToolsConfirmInfoBarDelegate(); 118 virtual ~DevToolsConfirmInfoBarDelegate();
119 119
120 virtual base::string16 GetMessageText() const OVERRIDE; 120 virtual base::string16 GetMessageText() const override;
121 virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; 121 virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
122 virtual bool Accept() OVERRIDE; 122 virtual bool Accept() override;
123 virtual bool Cancel() OVERRIDE; 123 virtual bool Cancel() override;
124 124
125 InfoBarCallback callback_; 125 InfoBarCallback callback_;
126 const base::string16 message_; 126 const base::string16 message_;
127 127
128 DISALLOW_COPY_AND_ASSIGN(DevToolsConfirmInfoBarDelegate); 128 DISALLOW_COPY_AND_ASSIGN(DevToolsConfirmInfoBarDelegate);
129 }; 129 };
130 130
131 void DevToolsConfirmInfoBarDelegate::Create( 131 void DevToolsConfirmInfoBarDelegate::Create(
132 InfoBarService* infobar_service, 132 InfoBarService* infobar_service,
133 const InfoBarCallback& callback, 133 const InfoBarCallback& callback,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // DevToolsUIDefaultDelegate -------------------------------------------------- 180 // DevToolsUIDefaultDelegate --------------------------------------------------
181 181
182 class DefaultBindingsDelegate : public DevToolsUIBindings::Delegate { 182 class DefaultBindingsDelegate : public DevToolsUIBindings::Delegate {
183 public: 183 public:
184 explicit DefaultBindingsDelegate(content::WebContents* web_contents) 184 explicit DefaultBindingsDelegate(content::WebContents* web_contents)
185 : web_contents_(web_contents) {} 185 : web_contents_(web_contents) {}
186 186
187 private: 187 private:
188 virtual ~DefaultBindingsDelegate() {} 188 virtual ~DefaultBindingsDelegate() {}
189 189
190 virtual void ActivateWindow() OVERRIDE; 190 virtual void ActivateWindow() override;
191 virtual void CloseWindow() OVERRIDE {} 191 virtual void CloseWindow() override {}
192 virtual void SetInspectedPageBounds(const gfx::Rect& rect) OVERRIDE {} 192 virtual void SetInspectedPageBounds(const gfx::Rect& rect) override {}
193 virtual void InspectElementCompleted() OVERRIDE {} 193 virtual void InspectElementCompleted() override {}
194 virtual void MoveWindow(int x, int y) OVERRIDE {} 194 virtual void MoveWindow(int x, int y) override {}
195 virtual void SetIsDocked(bool is_docked) OVERRIDE {} 195 virtual void SetIsDocked(bool is_docked) override {}
196 virtual void OpenInNewTab(const std::string& url) OVERRIDE; 196 virtual void OpenInNewTab(const std::string& url) override;
197 virtual void SetWhitelistedShortcuts(const std::string& message) OVERRIDE {} 197 virtual void SetWhitelistedShortcuts(const std::string& message) override {}
198 198
199 virtual void InspectedContentsClosing() OVERRIDE; 199 virtual void InspectedContentsClosing() override;
200 virtual void OnLoadCompleted() OVERRIDE {} 200 virtual void OnLoadCompleted() override {}
201 virtual InfoBarService* GetInfoBarService() OVERRIDE; 201 virtual InfoBarService* GetInfoBarService() override;
202 virtual void RenderProcessGone() OVERRIDE {} 202 virtual void RenderProcessGone() override {}
203 203
204 content::WebContents* web_contents_; 204 content::WebContents* web_contents_;
205 DISALLOW_COPY_AND_ASSIGN(DefaultBindingsDelegate); 205 DISALLOW_COPY_AND_ASSIGN(DefaultBindingsDelegate);
206 }; 206 };
207 207
208 void DefaultBindingsDelegate::ActivateWindow() { 208 void DefaultBindingsDelegate::ActivateWindow() {
209 web_contents_->GetDelegate()->ActivateContents(web_contents_); 209 web_contents_->GetDelegate()->ActivateContents(web_contents_);
210 web_contents_->Focus(); 210 web_contents_->Focus();
211 } 211 }
212 212
(...skipping 18 matching lines...) Expand all
231 // DevToolsUIBindings::FrontendWebContentsObserver ---------------------------- 231 // DevToolsUIBindings::FrontendWebContentsObserver ----------------------------
232 232
233 class DevToolsUIBindings::FrontendWebContentsObserver 233 class DevToolsUIBindings::FrontendWebContentsObserver
234 : public content::WebContentsObserver { 234 : public content::WebContentsObserver {
235 public: 235 public:
236 explicit FrontendWebContentsObserver(DevToolsUIBindings* ui_bindings); 236 explicit FrontendWebContentsObserver(DevToolsUIBindings* ui_bindings);
237 virtual ~FrontendWebContentsObserver(); 237 virtual ~FrontendWebContentsObserver();
238 238
239 private: 239 private:
240 // contents::WebContentsObserver: 240 // contents::WebContentsObserver:
241 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; 241 virtual void RenderProcessGone(base::TerminationStatus status) override;
242 virtual void AboutToNavigateRenderView( 242 virtual void AboutToNavigateRenderView(
243 content::RenderViewHost* render_view_host) OVERRIDE; 243 content::RenderViewHost* render_view_host) override;
244 virtual void DocumentOnLoadCompletedInMainFrame() OVERRIDE; 244 virtual void DocumentOnLoadCompletedInMainFrame() override;
245 virtual void DidNavigateMainFrame( 245 virtual void DidNavigateMainFrame(
246 const content::LoadCommittedDetails& details, 246 const content::LoadCommittedDetails& details,
247 const content::FrameNavigateParams& params) OVERRIDE; 247 const content::FrameNavigateParams& params) override;
248 248
249 DevToolsUIBindings* devtools_bindings_; 249 DevToolsUIBindings* devtools_bindings_;
250 DISALLOW_COPY_AND_ASSIGN(FrontendWebContentsObserver); 250 DISALLOW_COPY_AND_ASSIGN(FrontendWebContentsObserver);
251 }; 251 };
252 252
253 DevToolsUIBindings::FrontendWebContentsObserver::FrontendWebContentsObserver( 253 DevToolsUIBindings::FrontendWebContentsObserver::FrontendWebContentsObserver(
254 DevToolsUIBindings* devtools_ui_bindings) 254 DevToolsUIBindings* devtools_ui_bindings)
255 : WebContentsObserver(devtools_ui_bindings->web_contents()), 255 : WebContentsObserver(devtools_ui_bindings->web_contents()),
256 devtools_bindings_(devtools_ui_bindings) { 256 devtools_bindings_(devtools_ui_bindings) {
257 } 257 }
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 if (frontend_loaded_) 878 if (frontend_loaded_)
879 return; 879 return;
880 frontend_loaded_ = true; 880 frontend_loaded_ = true;
881 881
882 // Call delegate first - it seeds importants bit of information. 882 // Call delegate first - it seeds importants bit of information.
883 delegate_->OnLoadCompleted(); 883 delegate_->OnLoadCompleted();
884 884
885 UpdateTheme(); 885 UpdateTheme();
886 AddDevToolsExtensionsToClient(); 886 AddDevToolsExtensionsToClient();
887 } 887 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_ui_bindings.h ('k') | chrome/browser/devtools/devtools_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698