OLD | NEW |
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 Loading... |
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 virtual void RenderProcessGone(base::TerminationStatus status) override { |
50 [controller_ renderProcessGone]; | 50 [controller_ renderProcessGone]; |
51 } | 51 } |
52 virtual void WebContentsDestroyed() OVERRIDE { | 52 virtual void WebContentsDestroyed() override { |
53 [controller_ renderProcessGone]; | 53 [controller_ renderProcessGone]; |
54 } | 54 } |
55 | 55 |
56 private: | 56 private: |
57 HungRendererController* controller_; // weak | 57 HungRendererController* controller_; // weak |
58 | 58 |
59 DISALLOW_COPY_AND_ASSIGN(HungRendererWebContentsObserverBridge); | 59 DISALLOW_COPY_AND_ASSIGN(HungRendererWebContentsObserverBridge); |
60 }; | 60 }; |
61 | 61 |
62 @implementation HungRendererController | 62 @implementation HungRendererController |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 [g_instance showForWebContents:contents]; | 230 [g_instance showForWebContents:contents]; |
231 } | 231 } |
232 } | 232 } |
233 | 233 |
234 void HideHungRendererDialog(WebContents* contents) { | 234 void HideHungRendererDialog(WebContents* contents) { |
235 if (!logging::DialogsAreSuppressed() && g_instance) | 235 if (!logging::DialogsAreSuppressed() && g_instance) |
236 [g_instance endForWebContents:contents]; | 236 [g_instance endForWebContents:contents]; |
237 } | 237 } |
238 | 238 |
239 } // namespace chrome | 239 } // namespace chrome |
OLD | NEW |