OLD | NEW |
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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/memory/scoped_nsobject.h" | 9 #include "base/memory/scoped_nsobject.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 const GURL& url, | 119 const GURL& url, |
120 FullscreenExitBubbleType bubble_type) OVERRIDE; | 120 FullscreenExitBubbleType bubble_type) OVERRIDE; |
121 virtual void ExitPresentationMode() OVERRIDE; | 121 virtual void ExitPresentationMode() OVERRIDE; |
122 virtual bool InPresentationMode() OVERRIDE; | 122 virtual bool InPresentationMode() OVERRIDE; |
123 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; | 123 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; |
124 virtual void HideInstant() OVERRIDE; | 124 virtual void HideInstant() OVERRIDE; |
125 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 125 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
126 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 126 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
127 const gfx::Rect& bounds) OVERRIDE; | 127 const gfx::Rect& bounds) OVERRIDE; |
128 virtual FindBar* CreateFindBar() OVERRIDE; | 128 virtual FindBar* CreateFindBar() OVERRIDE; |
| 129 virtual void UpdatePreferredSize(content::WebContents* web_contents, |
| 130 const gfx::Size& pref_size) OVERRIDE; |
129 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 131 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
130 const gfx::Rect& rect) OVERRIDE; | 132 const gfx::Rect& rect) OVERRIDE; |
131 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; | 133 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; |
132 | 134 |
133 // Overridden from NotificationObserver | 135 // Overridden from NotificationObserver |
134 virtual void Observe(int type, | 136 virtual void Observe(int type, |
135 const content::NotificationSource& source, | 137 const content::NotificationSource& source, |
136 const content::NotificationDetails& details) OVERRIDE; | 138 const content::NotificationDetails& details) OVERRIDE; |
137 | 139 |
138 // Adds the given FindBar cocoa controller to this browser window. | 140 // Adds the given FindBar cocoa controller to this browser window. |
(...skipping 11 matching lines...) Expand all Loading... |
150 content::NotificationRegistrar registrar_; | 152 content::NotificationRegistrar registrar_; |
151 PrefChangeRegistrar pref_change_registrar_; | 153 PrefChangeRegistrar pref_change_registrar_; |
152 Browser* browser_; // weak, owned by controller | 154 Browser* browser_; // weak, owned by controller |
153 BrowserWindowController* controller_; // weak, owns us | 155 BrowserWindowController* controller_; // weak, owns us |
154 base::WeakPtrFactory<Browser> confirm_close_factory_; | 156 base::WeakPtrFactory<Browser> confirm_close_factory_; |
155 scoped_nsobject<NSString> pending_window_title_; | 157 scoped_nsobject<NSString> pending_window_title_; |
156 ui::WindowShowState initial_show_state_; | 158 ui::WindowShowState initial_show_state_; |
157 }; | 159 }; |
158 | 160 |
159 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 161 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
OLD | NEW |