| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 const extensions::Extension* app) OVERRIDE; | 125 const extensions::Extension* app) OVERRIDE; |
| 126 virtual void Cut() OVERRIDE; | 126 virtual void Cut() OVERRIDE; |
| 127 virtual void Copy() OVERRIDE; | 127 virtual void Copy() OVERRIDE; |
| 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, |
| 136 int height, |
| 137 InstantSizeUnits units) OVERRIDE; |
| 136 virtual void HideInstant() OVERRIDE; | 138 virtual void HideInstant() OVERRIDE; |
| 137 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 139 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 138 virtual bool IsInstantTabShowing() OVERRIDE; | 140 virtual bool IsInstantTabShowing() OVERRIDE; |
| 139 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 141 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 140 const gfx::Rect& bounds) OVERRIDE; | 142 const gfx::Rect& bounds) OVERRIDE; |
| 141 virtual FindBar* CreateFindBar() OVERRIDE; | 143 virtual FindBar* CreateFindBar() OVERRIDE; |
| 142 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 144 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
| 143 const gfx::Rect& rect) OVERRIDE; | 145 const gfx::Rect& rect) OVERRIDE; |
| 144 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; | 146 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; |
| 145 | 147 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 164 PrefChangeRegistrar pref_change_registrar_; | 166 PrefChangeRegistrar pref_change_registrar_; |
| 165 Browser* browser_; // weak, owned by controller | 167 Browser* browser_; // weak, owned by controller |
| 166 BrowserWindowController* controller_; // weak, owns us | 168 BrowserWindowController* controller_; // weak, owns us |
| 167 base::WeakPtrFactory<Browser> confirm_close_factory_; | 169 base::WeakPtrFactory<Browser> confirm_close_factory_; |
| 168 scoped_nsobject<NSString> pending_window_title_; | 170 scoped_nsobject<NSString> pending_window_title_; |
| 169 ui::WindowShowState initial_show_state_; | 171 ui::WindowShowState initial_show_state_; |
| 170 NSInteger attention_request_id_; // identifier from requestUserAttention | 172 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 171 }; | 173 }; |
| 172 | 174 |
| 173 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 175 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |