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

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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 | Annotate | Revision Log
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_UI_COCOA_HUNG_RENDERER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_HUNG_RENDERER_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_HUNG_RENDERER_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_HUNG_RENDERER_CONTROLLER_H_
7 7
8 // A controller for the Mac hung renderer dialog window. Only one 8 // A controller for the Mac hung renderer dialog window. Only one
9 // instance of this controller can exist at any time, although a given 9 // instance of this controller can exist at any time, although a given
10 // controller is destroyed when its window is closed. 10 // controller is destroyed when its window is closed.
11 // 11 //
12 // The dialog itself displays a list of frozen tabs, all of which 12 // The dialog itself displays a list of frozen tabs, all of which
13 // share a render process. Since there can only be a single dialog 13 // share a render process. Since there can only be a single dialog
14 // open at a time, if showForWebContents is called for a different 14 // open at a time, if showForWebContents is called for a different
15 // tab, the dialog is repurposed to show a warning for the new tab. 15 // tab, the dialog is repurposed to show a warning for the new tab.
16 // 16 //
17 // The caller is required to call endForWebContents before deleting 17 // The caller is required to call endForWebContents before deleting
18 // any WebContents object. 18 // any WebContents object.
19 19
20 #import <Cocoa/Cocoa.h> 20 #import <Cocoa/Cocoa.h>
21 21
22 #import "base/memory/scoped_nsobject.h" 22 #import "base/mac/scoped_nsobject.h"
23 #import "base/memory/scoped_ptr.h" 23 #import "base/memory/scoped_ptr.h"
24 24
25 @class MultiKeyEquivalentButton; 25 @class MultiKeyEquivalentButton;
26 class WebContentsObserverBridge; 26 class WebContentsObserverBridge;
27 27
28 namespace content { 28 namespace content {
29 class WebContents; 29 class WebContents;
30 } 30 }
31 31
32 @interface HungRendererController : NSWindowController<NSTableViewDataSource> { 32 @interface HungRendererController : NSWindowController<NSTableViewDataSource> {
33 @private 33 @private
34 IBOutlet MultiKeyEquivalentButton* waitButton_; 34 IBOutlet MultiKeyEquivalentButton* waitButton_;
35 IBOutlet NSButton* killButton_; 35 IBOutlet NSButton* killButton_;
36 IBOutlet NSTableView* tableView_; 36 IBOutlet NSTableView* tableView_;
37 IBOutlet NSImageView* imageView_; 37 IBOutlet NSImageView* imageView_;
38 IBOutlet NSTextField* messageView_; 38 IBOutlet NSTextField* messageView_;
39 39
40 // The WebContents for which this dialog is open. Should never be 40 // The WebContents for which this dialog is open. Should never be
41 // NULL while this dialog is open. 41 // NULL while this dialog is open.
42 content::WebContents* hungContents_; 42 content::WebContents* hungContents_;
43 43
44 // Observes |hungContents_| in case it closes while the panel is up. 44 // Observes |hungContents_| in case it closes while the panel is up.
45 scoped_ptr<WebContentsObserverBridge> hungContentsObserver_; 45 scoped_ptr<WebContentsObserverBridge> hungContentsObserver_;
46 46
47 // Backing data for |tableView_|. Titles of each WebContents that 47 // Backing data for |tableView_|. Titles of each WebContents that
48 // shares a renderer process with |hungContents_|. 48 // shares a renderer process with |hungContents_|.
49 scoped_nsobject<NSArray> hungTitles_; 49 base::scoped_nsobject<NSArray> hungTitles_;
50 50
51 // Favicons of each WebContents that shares a renderer process with 51 // Favicons of each WebContents that shares a renderer process with
52 // |hungContents_|. 52 // |hungContents_|.
53 scoped_nsobject<NSArray> hungFavicons_; 53 base::scoped_nsobject<NSArray> hungFavicons_;
54 } 54 }
55 55
56 // Kills the hung renderers. 56 // Kills the hung renderers.
57 - (IBAction)kill:(id)sender; 57 - (IBAction)kill:(id)sender;
58 58
59 // Waits longer for the renderers to respond. 59 // Waits longer for the renderers to respond.
60 - (IBAction)wait:(id)sender; 60 - (IBAction)wait:(id)sender;
61 61
62 // Modifies the dialog to show a warning for the given tab contents. 62 // Modifies the dialog to show a warning for the given tab contents.
63 // The dialog will contain a list of all tabs that share a renderer 63 // The dialog will contain a list of all tabs that share a renderer
(...skipping 13 matching lines...) Expand all
77 77
78 @end // HungRendererController 78 @end // HungRendererController
79 79
80 80
81 @interface HungRendererController (JustForTesting) 81 @interface HungRendererController (JustForTesting)
82 - (NSButton*)killButton; 82 - (NSButton*)killButton;
83 - (MultiKeyEquivalentButton*)waitButton; 83 - (MultiKeyEquivalentButton*)waitButton;
84 @end 84 @end
85 85
86 #endif // CHROME_BROWSER_UI_COCOA_HUNG_RENDERER_CONTROLLER_H_ 86 #endif // CHROME_BROWSER_UI_COCOA_HUNG_RENDERER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698