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

Side by Side Diff: chrome/browser/app_controller_mac.h

Issue 402066: Moved a whole pile of unittests over to CocoaTest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « chrome/app/nibs/AboutIPC.xib ('k') | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_APP_CONTROLLER_MAC_H_ 5 #ifndef CHROME_BROWSER_APP_CONTROLLER_MAC_H_
6 #define CHROME_BROWSER_APP_CONTROLLER_MAC_H_ 6 #define CHROME_BROWSER_APP_CONTROLLER_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 12 matching lines...) Expand all
23 // The application controller object, created by loading the MainMenu nib. 23 // The application controller object, created by loading the MainMenu nib.
24 // This handles things like responding to menus when there are no windows 24 // This handles things like responding to menus when there are no windows
25 // open, etc and acts as the NSApplication delegate. 25 // open, etc and acts as the NSApplication delegate.
26 @interface AppController : NSObject<NSUserInterfaceValidations> { 26 @interface AppController : NSObject<NSUserInterfaceValidations> {
27 @private 27 @private
28 scoped_ptr<CommandUpdater> menuState_; 28 scoped_ptr<CommandUpdater> menuState_;
29 // Management of the bookmark menu which spans across all windows 29 // Management of the bookmark menu which spans across all windows
30 // (and Browser*s). 30 // (and Browser*s).
31 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; 31 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_;
32 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; 32 scoped_ptr<HistoryMenuBridge> historyMenuBridge_;
33 scoped_nsobject<PreferencesWindowController> prefsController_; 33 PreferencesWindowController* prefsController_; // Weak.
34 scoped_nsobject<AboutWindowController> aboutController_; 34 AboutWindowController* aboutController_; // Weak.
35 35
36 // URLs that need to be opened when the app is fully initialized. Because it's 36 // URLs that need to be opened when the app is fully initialized. Because it's
37 // only needed during early startup, it points to a valid vector during early 37 // only needed during early startup, it points to a valid vector during early
38 // startup and is NULL during the rest of app execution. 38 // startup and is NULL during the rest of app execution.
39 scoped_ptr<std::vector<GURL> > pendingURLs_; 39 scoped_ptr<std::vector<GURL> > pendingURLs_;
40 40
41 // Outlets for the close tab/window menu items so that we can adjust the 41 // Outlets for the close tab/window menu items so that we can adjust the
42 // commmand-key equivalent depending on the kind of window and how many 42 // commmand-key equivalent depending on the kind of window and how many
43 // tabs it has. 43 // tabs it has.
44 IBOutlet NSMenuItem* closeTabMenuItem_; 44 IBOutlet NSMenuItem* closeTabMenuItem_;
(...skipping 11 matching lines...) Expand all
56 // Redirect in the menu item from the expected target of "File's 56 // Redirect in the menu item from the expected target of "File's
57 // Owner" (NSAppliation) for a Branded About Box 57 // Owner" (NSAppliation) for a Branded About Box
58 - (IBAction)orderFrontStandardAboutPanel:(id)sender; 58 - (IBAction)orderFrontStandardAboutPanel:(id)sender;
59 59
60 // Delegate method to return the dock menu. 60 // Delegate method to return the dock menu.
61 - (NSMenu*)applicationDockMenu:(NSApplication*)sender; 61 - (NSMenu*)applicationDockMenu:(NSApplication*)sender;
62 62
63 @end 63 @end
64 64
65 #endif 65 #endif
OLDNEW
« no previous file with comments | « chrome/app/nibs/AboutIPC.xib ('k') | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698