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 | 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 virtual void Paste() OVERRIDE; | 128 virtual void Paste() OVERRIDE; |
129 virtual void OpenTabpose() OVERRIDE; | 129 virtual void OpenTabpose() OVERRIDE; |
130 virtual void EnterPresentationMode( | 130 virtual void EnterPresentationMode( |
131 const GURL& url, | 131 const GURL& url, |
132 FullscreenExitBubbleType bubble_type) OVERRIDE; | 132 FullscreenExitBubbleType bubble_type) OVERRIDE; |
133 virtual void ExitPresentationMode() OVERRIDE; | 133 virtual void ExitPresentationMode() OVERRIDE; |
134 virtual bool InPresentationMode() OVERRIDE; | 134 virtual bool InPresentationMode() OVERRIDE; |
135 virtual void ShowInstant(TabContents* preview) OVERRIDE; | 135 virtual void ShowInstant(TabContents* preview) OVERRIDE; |
136 virtual void HideInstant() OVERRIDE; | 136 virtual void HideInstant() OVERRIDE; |
137 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 137 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 138 virtual bool GetIsShowingInstant() OVERRIDE; |
138 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 139 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
139 const gfx::Rect& bounds) OVERRIDE; | 140 const gfx::Rect& bounds) OVERRIDE; |
140 virtual FindBar* CreateFindBar() OVERRIDE; | 141 virtual FindBar* CreateFindBar() OVERRIDE; |
141 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 142 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
142 const gfx::Rect& rect) OVERRIDE; | 143 const gfx::Rect& rect) OVERRIDE; |
143 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; | 144 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; |
144 | 145 |
145 // Overridden from NotificationObserver | 146 // Overridden from NotificationObserver |
146 virtual void Observe(int type, | 147 virtual void Observe(int type, |
147 const content::NotificationSource& source, | 148 const content::NotificationSource& source, |
(...skipping 15 matching lines...) Expand all Loading... |
163 PrefChangeRegistrar pref_change_registrar_; | 164 PrefChangeRegistrar pref_change_registrar_; |
164 Browser* browser_; // weak, owned by controller | 165 Browser* browser_; // weak, owned by controller |
165 BrowserWindowController* controller_; // weak, owns us | 166 BrowserWindowController* controller_; // weak, owns us |
166 base::WeakPtrFactory<Browser> confirm_close_factory_; | 167 base::WeakPtrFactory<Browser> confirm_close_factory_; |
167 scoped_nsobject<NSString> pending_window_title_; | 168 scoped_nsobject<NSString> pending_window_title_; |
168 ui::WindowShowState initial_show_state_; | 169 ui::WindowShowState initial_show_state_; |
169 NSInteger attention_request_id_; // identifier from requestUserAttention | 170 NSInteger attention_request_id_; // identifier from requestUserAttention |
170 }; | 171 }; |
171 | 172 |
172 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 173 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
OLD | NEW |