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

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

Issue 2196203002: [Mac] The infobar's top arrow should be hidden while the omnibox popup is shown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert to the patch set 1 Created 4 years, 4 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
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 @class TranslateBubbleController; 57 @class TranslateBubbleController;
58 58
59 namespace content { 59 namespace content {
60 class WebContents; 60 class WebContents;
61 } 61 }
62 62
63 namespace extensions { 63 namespace extensions {
64 class Command; 64 class Command;
65 } 65 }
66 66
67 namespace {
68 class OmniboxPopupModelObserverBridge;
69 }
70
67 @interface BrowserWindowController 71 @interface BrowserWindowController
68 : TabWindowController<BookmarkBarControllerDelegate, 72 : TabWindowController<BookmarkBarControllerDelegate,
69 ViewResizer, 73 ViewResizer,
70 TabStripControllerDelegate> { 74 TabStripControllerDelegate> {
71 @private 75 @private
72 // The ordering of these members is important as it determines the order in 76 // The ordering of these members is important as it determines the order in
73 // which they are destroyed. |browser_| needs to be destroyed last as most of 77 // which they are destroyed. |browser_| needs to be destroyed last as most of
74 // the other objects hold weak references to it or things it owns 78 // the other objects hold weak references to it or things it owns
75 // (tab/toolbar/bookmark models, profiles, etc). 79 // (tab/toolbar/bookmark models, profiles, etc).
76 std::unique_ptr<Browser> browser_; 80 std::unique_ptr<Browser> browser_;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 198
195 // If this ivar is set to YES, layoutSubviews calls will be ignored. This is 199 // If this ivar is set to YES, layoutSubviews calls will be ignored. This is
196 // used in fullscreen transition to prevent spurious resize messages from 200 // used in fullscreen transition to prevent spurious resize messages from
197 // being sent to the renderer, which causes the transition to be janky. 201 // being sent to the renderer, which causes the transition to be janky.
198 BOOL blockLayoutSubviews_; 202 BOOL blockLayoutSubviews_;
199 203
200 // The Extension Command Registry used to determine which keyboard events to 204 // The Extension Command Registry used to determine which keyboard events to
201 // handle. 205 // handle.
202 std::unique_ptr<ExtensionKeybindingRegistryCocoa> 206 std::unique_ptr<ExtensionKeybindingRegistryCocoa>
203 extension_keybinding_registry_; 207 extension_keybinding_registry_;
208
209 // Observes whether the omnibox popup is shown or hidden.
210 std::unique_ptr<OmniboxPopupModelObserverBridge>
211 omnibox_popup_model_observer_bridge_;
Robert Sesek 2016/08/04 17:13:40 naming: use camelCase since this is an ObjC ivar (
Sungmann Cho 2016/08/04 17:42:26 Done.
204 } 212 }
205 213
206 // A convenience class method which gets the |BrowserWindowController| for a 214 // A convenience class method which gets the |BrowserWindowController| for a
207 // given window. This method returns nil if no window in the chain has a BWC. 215 // given window. This method returns nil if no window in the chain has a BWC.
208 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window; 216 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window;
209 217
210 // A convenience class method which gets the |BrowserWindowController| for a 218 // A convenience class method which gets the |BrowserWindowController| for a
211 // given view. This is the controller for the window containing |view|, if it 219 // given view. This is the controller for the window containing |view|, if it
212 // is a BWC, or the first controller in the parent-window chain that is a 220 // is a BWC, or the first controller in the parent-window chain that is a
213 // BWC. This method returns nil if no window in the chain has a BWC. 221 // BWC. This method returns nil if no window in the chain has a BWC.
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 // Returns the fullscreen toolbar controller. 644 // Returns the fullscreen toolbar controller.
637 - (FullscreenToolbarController*)fullscreenToolbarController; 645 - (FullscreenToolbarController*)fullscreenToolbarController;
638 646
639 // Sets the fullscreen toolbar controller. 647 // Sets the fullscreen toolbar controller.
640 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller; 648 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller;
641 649
642 @end // @interface BrowserWindowController (TestingAPI) 650 @end // @interface BrowserWindowController (TestingAPI)
643 651
644 652
645 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 653 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698