| 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/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 virtual void Copy() OVERRIDE; | 129 virtual void Copy() OVERRIDE; |
| 130 virtual void Paste() OVERRIDE; | 130 virtual void Paste() OVERRIDE; |
| 131 virtual void OpenTabpose() OVERRIDE; | 131 virtual void OpenTabpose() OVERRIDE; |
| 132 virtual void EnterFullscreenWithChrome() OVERRIDE; | 132 virtual void EnterFullscreenWithChrome() OVERRIDE; |
| 133 virtual bool IsFullscreenWithChrome() OVERRIDE; | 133 virtual bool IsFullscreenWithChrome() OVERRIDE; |
| 134 virtual bool IsFullscreenWithoutChrome() OVERRIDE; | 134 virtual bool IsFullscreenWithoutChrome() OVERRIDE; |
| 135 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 135 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 136 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 136 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 137 const gfx::Rect& bounds) OVERRIDE; | 137 const gfx::Rect& bounds) OVERRIDE; |
| 138 virtual FindBar* CreateFindBar() OVERRIDE; | 138 virtual FindBar* CreateFindBar() OVERRIDE; |
| 139 virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE; | 139 virtual web_modal::WebContentsModalDialogHost* |
| 140 GetWebContentsModalDialogHost() OVERRIDE; |
| 140 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 141 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
| 141 const gfx::Rect& rect) OVERRIDE; | 142 const gfx::Rect& rect) OVERRIDE; |
| 142 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; | 143 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; |
| 143 virtual void ShowPasswordGenerationBubble( | 144 virtual void ShowPasswordGenerationBubble( |
| 144 const gfx::Rect& rect, | 145 const gfx::Rect& rect, |
| 145 const content::PasswordForm& form, | 146 const content::PasswordForm& form, |
| 146 autofill::PasswordGenerator* password_generator) OVERRIDE; | 147 autofill::PasswordGenerator* password_generator) OVERRIDE; |
| 147 | 148 |
| 148 // Overridden from ExtensionKeybindingRegistry::Delegate: | 149 // Overridden from ExtensionKeybindingRegistry::Delegate: |
| 149 virtual extensions::ActiveTabPermissionGranter* | 150 virtual extensions::ActiveTabPermissionGranter* |
| (...skipping 17 matching lines...) Expand all Loading... |
| 167 | 168 |
| 168 Browser* browser_; // weak, owned by controller | 169 Browser* browser_; // weak, owned by controller |
| 169 BrowserWindowController* controller_; // weak, owns us | 170 BrowserWindowController* controller_; // weak, owns us |
| 170 base::WeakPtrFactory<Browser> confirm_close_factory_; | 171 base::WeakPtrFactory<Browser> confirm_close_factory_; |
| 171 scoped_nsobject<NSString> pending_window_title_; | 172 scoped_nsobject<NSString> pending_window_title_; |
| 172 ui::WindowShowState initial_show_state_; | 173 ui::WindowShowState initial_show_state_; |
| 173 NSInteger attention_request_id_; // identifier from requestUserAttention | 174 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 174 }; | 175 }; |
| 175 | 176 |
| 176 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 177 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |