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

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

Issue 8477042: Move Sad Tab implementation out of the TabContentsViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes for jochen and jam Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/mac_util.h" 9 #include "base/mac/mac_util.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 28 matching lines...) Expand all
39 class TabContentsObserverBridge : public TabContentsObserver { 39 class TabContentsObserverBridge : public TabContentsObserver {
40 public: 40 public:
41 TabContentsObserverBridge(TabContents* tab_contents, 41 TabContentsObserverBridge(TabContents* tab_contents,
42 HungRendererController* controller) 42 HungRendererController* controller)
43 : TabContentsObserver(tab_contents), 43 : TabContentsObserver(tab_contents),
44 controller_(controller) { 44 controller_(controller) {
45 } 45 }
46 46
47 protected: 47 protected:
48 // TabContentsObserver overrides: 48 // TabContentsObserver overrides:
49 virtual void RenderViewGone() OVERRIDE { 49 virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE {
50 [controller_ renderViewGone]; 50 [controller_ renderViewGone];
51 } 51 }
52 virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE { 52 virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE {
53 [controller_ renderViewGone]; 53 [controller_ renderViewGone];
54 } 54 }
55 55
56 private: 56 private:
57 HungRendererController* controller_; // weak 57 HungRendererController* controller_; // weak
58 58
59 DISALLOW_COPY_AND_ASSIGN(TabContentsObserverBridge); 59 DISALLOW_COPY_AND_ASSIGN(TabContentsObserverBridge);
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 [g_instance showForTabContents:contents]; 223 [g_instance showForTabContents:contents];
224 } 224 }
225 } 225 }
226 226
227 void HideNativeHungRendererDialog(TabContents* contents) { 227 void HideNativeHungRendererDialog(TabContents* contents) {
228 if (!logging::DialogsAreSuppressed() && g_instance) 228 if (!logging::DialogsAreSuppressed() && g_instance)
229 [g_instance endForTabContents:contents]; 229 [g_instance endForTabContents:contents];
230 } 230 }
231 231
232 } // namespace browser 232 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698