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

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

Issue 2695493002: [Mac] Touch Bar support for default browser window state (Closed)
Patch Set: Rebased Created 3 years, 10 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 | « chrome/browser/ui/BUILD.gn ('k') | 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 18 matching lines...) Expand all
29 #include "components/translate/core/common/translate_errors.h" 29 #include "components/translate/core/common/translate_errors.h"
30 #include "ui/base/accelerators/accelerator_manager.h" 30 #include "ui/base/accelerators/accelerator_manager.h"
31 #include "ui/gfx/geometry/rect.h" 31 #include "ui/gfx/geometry/rect.h"
32 32
33 @class AvatarBaseController; 33 @class AvatarBaseController;
34 class BookmarkBubbleObserverCocoa; 34 class BookmarkBubbleObserverCocoa;
35 class Browser; 35 class Browser;
36 class BrowserWindow; 36 class BrowserWindow;
37 class BrowserWindowCocoa; 37 class BrowserWindowCocoa;
38 @class BrowserWindowFullscreenTransition; 38 @class BrowserWindowFullscreenTransition;
39 @class BrowserWindowTouchBar;
39 @class DevToolsController; 40 @class DevToolsController;
40 @class DownloadShelfController; 41 @class DownloadShelfController;
41 class ExtensionKeybindingRegistryCocoa; 42 class ExtensionKeybindingRegistryCocoa;
42 class ExclusiveAccessController; 43 class ExclusiveAccessController;
43 class ExclusiveAccessContext; 44 class ExclusiveAccessContext;
44 @class FindBarCocoaController; 45 @class FindBarCocoaController;
45 @class FullscreenModeController; 46 @class FullscreenModeController;
46 @class FullscreenToolbarController; 47 @class FullscreenToolbarController;
47 @class FullscreenToolbarVisibilityLockController; 48 @class FullscreenToolbarVisibilityLockController;
48 @class FullscreenWindow; 49 @class FullscreenWindow;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 base::scoped_nsobject<DevToolsController> devToolsController_; 86 base::scoped_nsobject<DevToolsController> devToolsController_;
86 base::scoped_nsobject<OverlayableContentsController> 87 base::scoped_nsobject<OverlayableContentsController>
87 overlayableContentsController_; 88 overlayableContentsController_;
88 base::scoped_nsobject<FullscreenToolbarController> 89 base::scoped_nsobject<FullscreenToolbarController>
89 fullscreenToolbarController_; 90 fullscreenToolbarController_;
90 std::unique_ptr<ExclusiveAccessController> exclusiveAccessController_; 91 std::unique_ptr<ExclusiveAccessController> exclusiveAccessController_;
91 base::scoped_nsobject<BrowserWindowFullscreenTransition> 92 base::scoped_nsobject<BrowserWindowFullscreenTransition>
92 fullscreenTransition_; 93 fullscreenTransition_;
93 std::unique_ptr<FullscreenLowPowerCoordinatorCocoa> 94 std::unique_ptr<FullscreenLowPowerCoordinatorCocoa>
94 fullscreenLowPowerCoordinator_; 95 fullscreenLowPowerCoordinator_;
96 base::scoped_nsobject<BrowserWindowTouchBar> touchBar_;
95 97
96 // Strong. StatusBubble is a special case of a strong reference that 98 // Strong. StatusBubble is a special case of a strong reference that
97 // we don't wrap in a scoped_ptr because it is acting the same 99 // we don't wrap in a scoped_ptr because it is acting the same
98 // as an NSWindowController in that it wraps a window that must 100 // as an NSWindowController in that it wraps a window that must
99 // be shut down before our destructors are called. 101 // be shut down before our destructors are called.
100 StatusBubbleMac* statusBubble_; 102 StatusBubbleMac* statusBubble_;
101 103
102 std::unique_ptr<BookmarkBubbleObserverCocoa> bookmarkBubbleObserver_; 104 std::unique_ptr<BookmarkBubbleObserverCocoa> bookmarkBubbleObserver_;
103 BookmarkBubbleController* bookmarkBubbleController_; // Weak. 105 BookmarkBubbleController* bookmarkBubbleController_; // Weak.
104 BOOL initializing_; // YES while we are currently in initWithBrowser: 106 BOOL initializing_; // YES while we are currently in initWithBrowser:
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 command:(const extensions::Command&)command; 380 command:(const extensions::Command&)command;
379 381
380 // Sets the alert state of the tab e.g. audio playing, media recording, etc. 382 // Sets the alert state of the tab e.g. audio playing, media recording, etc.
381 // See TabUtils::TabAlertState for a list of all possible alert states. 383 // See TabUtils::TabAlertState for a list of all possible alert states.
382 - (void)setAlertState:(TabAlertState)alertState; 384 - (void)setAlertState:(TabAlertState)alertState;
383 385
384 // Returns current alert state, determined by the alert state of tabs, set by 386 // Returns current alert state, determined by the alert state of tabs, set by
385 // UpdateAlertState. 387 // UpdateAlertState.
386 - (TabAlertState)alertState; 388 - (TabAlertState)alertState;
387 389
390 // Returns the BrowserWindowTouchBar object associated with the window.
391 - (BrowserWindowTouchBar*)browserWindowTouchBar;
392
388 @end // @interface BrowserWindowController 393 @end // @interface BrowserWindowController
389 394
390 395
391 // Methods having to do with the window type (normal/popup/app, and whether the 396 // Methods having to do with the window type (normal/popup/app, and whether the
392 // window has various features. 397 // window has various features.
393 @interface BrowserWindowController(WindowType) 398 @interface BrowserWindowController(WindowType)
394 399
395 // Determines whether this controller's window supports a given feature (i.e., 400 // Determines whether this controller's window supports a given feature (i.e.,
396 // whether a given feature is or can be shown in the window). 401 // whether a given feature is or can be shown in the window).
397 // TODO(viettrungluu): |feature| is really should be |Browser::Feature|, but I 402 // TODO(viettrungluu): |feature| is really should be |Browser::Feature|, but I
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 // Returns the fullscreen toolbar controller. 611 // Returns the fullscreen toolbar controller.
607 - (FullscreenToolbarController*)fullscreenToolbarController; 612 - (FullscreenToolbarController*)fullscreenToolbarController;
608 613
609 // Sets the fullscreen toolbar controller. 614 // Sets the fullscreen toolbar controller.
610 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller; 615 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller;
611 616
612 @end // @interface BrowserWindowController (TestingAPI) 617 @end // @interface BrowserWindowController (TestingAPI)
613 618
614 619
615 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 620 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698