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

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

Issue 1259903002: DO NOT COMMIT: [Mac] Refactor keyboard shortcut handling so it can be reused in Views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to new CommandDispatcher design. Created 5 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.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) 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_BROWSER_WINDOW_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
7 7
8 // A class acting as the Objective-C controller for the Browser 8 // A class acting as the Objective-C controller for the Browser
9 // object. Handles interactions between Cocoa and the cross-platform 9 // object. Handles interactions between Cocoa and the cross-platform
10 // code. Each window has a single toolbar and, by virtue of being a 10 // code. Each window has a single toolbar and, by virtue of being a
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 @class TranslateBubbleController; 50 @class TranslateBubbleController;
51 51
52 namespace content { 52 namespace content {
53 class WebContents; 53 class WebContents;
54 } 54 }
55 55
56 namespace extensions { 56 namespace extensions {
57 class Command; 57 class Command;
58 } 58 }
59 59
60 @interface BrowserWindowController : 60 @interface BrowserWindowController
61 TabWindowController<NSUserInterfaceValidations, 61 : TabWindowController<BookmarkBarControllerDelegate,
62 BookmarkBarControllerDelegate, 62 ViewResizer,
63 ViewResizer, 63 TabStripControllerDelegate> {
64 TabStripControllerDelegate> {
65 @private 64 @private
66 // The ordering of these members is important as it determines the order in 65 // The ordering of these members is important as it determines the order in
67 // which they are destroyed. |browser_| needs to be destroyed last as most of 66 // which they are destroyed. |browser_| needs to be destroyed last as most of
68 // the other objects hold weak references to it or things it owns 67 // the other objects hold weak references to it or things it owns
69 // (tab/toolbar/bookmark models, profiles, etc). 68 // (tab/toolbar/bookmark models, profiles, etc).
70 scoped_ptr<Browser> browser_; 69 scoped_ptr<Browser> browser_;
71 NSWindow* savedRegularWindow_; 70 NSWindow* savedRegularWindow_;
72 scoped_ptr<BrowserWindowCocoa> windowShim_; 71 scoped_ptr<BrowserWindowCocoa> windowShim_;
73 base::scoped_nsobject<ToolbarController> toolbarController_; 72 base::scoped_nsobject<ToolbarController> toolbarController_;
74 base::scoped_nsobject<TabStripController> tabStripController_; 73 base::scoped_nsobject<TabStripController> tabStripController_;
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 - (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController; 605 - (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController;
607 606
608 // Gets the rect, in window base coordinates, that the omnibox popup should be 607 // Gets the rect, in window base coordinates, that the omnibox popup should be
609 // positioned relative to. 608 // positioned relative to.
610 - (NSRect)omniboxPopupAnchorRect; 609 - (NSRect)omniboxPopupAnchorRect;
611 610
612 @end // @interface BrowserWindowController (TestingAPI) 611 @end // @interface BrowserWindowController (TestingAPI)
613 612
614 613
615 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 614 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698