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

Side by Side Diff: chrome/browser/ui/cocoa/hung_renderer_controller.mm

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" 5 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 28 matching lines...) Expand all
39 : public content::WebContentsObserver { 39 : public content::WebContentsObserver {
40 public: 40 public:
41 HungRendererWebContentsObserverBridge(WebContents* web_contents, 41 HungRendererWebContentsObserverBridge(WebContents* web_contents,
42 HungRendererController* controller) 42 HungRendererController* controller)
43 : content::WebContentsObserver(web_contents), 43 : content::WebContentsObserver(web_contents),
44 controller_(controller) { 44 controller_(controller) {
45 } 45 }
46 46
47 protected: 47 protected:
48 // WebContentsObserver overrides: 48 // WebContentsObserver overrides:
49 virtual void RenderProcessGone(base::TerminationStatus status) override { 49 void RenderProcessGone(base::TerminationStatus status) override {
50 [controller_ renderProcessGone]; 50 [controller_ renderProcessGone];
51 } 51 }
52 virtual void WebContentsDestroyed() override { 52 void WebContentsDestroyed() override { [controller_ renderProcessGone]; }
53 [controller_ renderProcessGone];
54 }
55 53
56 private: 54 private:
57 HungRendererController* controller_; // weak 55 HungRendererController* controller_; // weak
58 56
59 DISALLOW_COPY_AND_ASSIGN(HungRendererWebContentsObserverBridge); 57 DISALLOW_COPY_AND_ASSIGN(HungRendererWebContentsObserverBridge);
60 }; 58 };
61 59
62 @implementation HungRendererController 60 @implementation HungRendererController
63 61
64 - (id)initWithWindowNibName:(NSString*)nibName { 62 - (id)initWithWindowNibName:(NSString*)nibName {
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 [g_instance showForWebContents:contents]; 228 [g_instance showForWebContents:contents];
231 } 229 }
232 } 230 }
233 231
234 void HideHungRendererDialog(WebContents* contents) { 232 void HideHungRendererDialog(WebContents* contents) {
235 if (!logging::DialogsAreSuppressed() && g_instance) 233 if (!logging::DialogsAreSuppressed() && g_instance)
236 [g_instance endForWebContents:contents]; 234 [g_instance endForWebContents:contents];
237 } 235 }
238 236
239 } // namespace chrome 237 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698