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

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

Issue 10933085: Update ConstrainedWindowViews appearance according to mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Browser test fixes Created 8 years, 2 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_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
7 7
8 #include "base/memory/scoped_nsobject.h" 8 #include "base/memory/scoped_nsobject.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/api/prefs/pref_change_registrar.h" 10 #include "chrome/browser/api/prefs/pref_change_registrar.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 virtual bool InPresentationMode() OVERRIDE; 138 virtual bool InPresentationMode() OVERRIDE;
139 virtual void ShowInstant(TabContents* preview, 139 virtual void ShowInstant(TabContents* preview,
140 int height, 140 int height,
141 InstantSizeUnits units) OVERRIDE; 141 InstantSizeUnits units) OVERRIDE;
142 virtual void HideInstant() OVERRIDE; 142 virtual void HideInstant() OVERRIDE;
143 virtual gfx::Rect GetInstantBounds() OVERRIDE; 143 virtual gfx::Rect GetInstantBounds() OVERRIDE;
144 virtual bool IsInstantTabShowing() OVERRIDE; 144 virtual bool IsInstantTabShowing() OVERRIDE;
145 virtual WindowOpenDisposition GetDispositionForPopupBounds( 145 virtual WindowOpenDisposition GetDispositionForPopupBounds(
146 const gfx::Rect& bounds) OVERRIDE; 146 const gfx::Rect& bounds) OVERRIDE;
147 virtual FindBar* CreateFindBar() OVERRIDE; 147 virtual FindBar* CreateFindBar() OVERRIDE;
148 virtual int GetConstrainedWindowTopY() OVERRIDE;
148 virtual void ShowAvatarBubble(content::WebContents* web_contents, 149 virtual void ShowAvatarBubble(content::WebContents* web_contents,
149 const gfx::Rect& rect) OVERRIDE; 150 const gfx::Rect& rect) OVERRIDE;
150 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; 151 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE;
151 152
152 // Overridden from NotificationObserver 153 // Overridden from NotificationObserver
153 virtual void Observe(int type, 154 virtual void Observe(int type,
154 const content::NotificationSource& source, 155 const content::NotificationSource& source,
155 const content::NotificationDetails& details) OVERRIDE; 156 const content::NotificationDetails& details) OVERRIDE;
156 157
157 // Overridden from ExtensionKeybindingRegistry::Delegate: 158 // Overridden from ExtensionKeybindingRegistry::Delegate:
(...skipping 16 matching lines...) Expand all
174 PrefChangeRegistrar pref_change_registrar_; 175 PrefChangeRegistrar pref_change_registrar_;
175 Browser* browser_; // weak, owned by controller 176 Browser* browser_; // weak, owned by controller
176 BrowserWindowController* controller_; // weak, owns us 177 BrowserWindowController* controller_; // weak, owns us
177 base::WeakPtrFactory<Browser> confirm_close_factory_; 178 base::WeakPtrFactory<Browser> confirm_close_factory_;
178 scoped_nsobject<NSString> pending_window_title_; 179 scoped_nsobject<NSString> pending_window_title_;
179 ui::WindowShowState initial_show_state_; 180 ui::WindowShowState initial_show_state_;
180 NSInteger attention_request_id_; // identifier from requestUserAttention 181 NSInteger attention_request_id_; // identifier from requestUserAttention
181 }; 182 };
182 183
183 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 184 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698