| 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/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 10 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 const content::NativeWebKeyboardEvent& event) override; | 146 const content::NativeWebKeyboardEvent& event) override; |
| 147 void CutCopyPaste(int command_id) override; | 147 void CutCopyPaste(int command_id) override; |
| 148 WindowOpenDisposition GetDispositionForPopupBounds( | 148 WindowOpenDisposition GetDispositionForPopupBounds( |
| 149 const gfx::Rect& bounds) override; | 149 const gfx::Rect& bounds) override; |
| 150 FindBar* CreateFindBar() override; | 150 FindBar* CreateFindBar() override; |
| 151 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 151 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
| 152 override; | 152 override; |
| 153 void ShowAvatarBubbleFromAvatarButton( | 153 void ShowAvatarBubbleFromAvatarButton( |
| 154 AvatarBubbleMode mode, | 154 AvatarBubbleMode mode, |
| 155 const signin::ManageAccountsParams& manage_accounts_params) override; | 155 const signin::ManageAccountsParams& manage_accounts_params) override; |
| 156 void CloseAvatarBubbleFromAvatarButton() override; |
| 156 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; | 157 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; |
| 157 void ExecuteExtensionCommand(const extensions::Extension* extension, | 158 void ExecuteExtensionCommand(const extensions::Extension* extension, |
| 158 const extensions::Command& command) override; | 159 const extensions::Command& command) override; |
| 159 ExclusiveAccessContext* GetExclusiveAccessContext() override; | 160 ExclusiveAccessContext* GetExclusiveAccessContext() override; |
| 160 | 161 |
| 161 // ExclusiveAccessContext interface | 162 // ExclusiveAccessContext interface |
| 162 Profile* GetProfile() override; | 163 Profile* GetProfile() override; |
| 163 content::WebContents* GetActiveWebContents() override; | 164 content::WebContents* GetActiveWebContents() override; |
| 164 void UnhideDownloadShelf() override; | 165 void UnhideDownloadShelf() override; |
| 165 void HideDownloadShelf() override; | 166 void HideDownloadShelf() override; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 185 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 186 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 186 | 187 |
| 187 Browser* browser_; // weak, owned by controller | 188 Browser* browser_; // weak, owned by controller |
| 188 BrowserWindowController* controller_; // weak, owns us | 189 BrowserWindowController* controller_; // weak, owns us |
| 189 base::scoped_nsobject<NSString> pending_window_title_; | 190 base::scoped_nsobject<NSString> pending_window_title_; |
| 190 ui::WindowShowState initial_show_state_; | 191 ui::WindowShowState initial_show_state_; |
| 191 NSInteger attention_request_id_; // identifier from requestUserAttention | 192 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 192 }; | 193 }; |
| 193 | 194 |
| 194 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 195 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |