| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 void HandleKeyboardEvent( | 140 void HandleKeyboardEvent( |
| 141 const content::NativeWebKeyboardEvent& event) override; | 141 const content::NativeWebKeyboardEvent& event) override; |
| 142 void Cut() override; | 142 void Cut() override; |
| 143 void Copy() override; | 143 void Copy() override; |
| 144 void Paste() override; | 144 void Paste() override; |
| 145 WindowOpenDisposition GetDispositionForPopupBounds( | 145 WindowOpenDisposition GetDispositionForPopupBounds( |
| 146 const gfx::Rect& bounds) override; | 146 const gfx::Rect& bounds) override; |
| 147 FindBar* CreateFindBar() override; | 147 FindBar* CreateFindBar() override; |
| 148 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 148 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
| 149 override; | 149 override; |
| 150 void ShowAvatarBubble(content::WebContents* web_contents, | |
| 151 const gfx::Rect& rect) override; | |
| 152 void ShowAvatarBubbleFromAvatarButton( | 150 void ShowAvatarBubbleFromAvatarButton( |
| 153 AvatarBubbleMode mode, | 151 AvatarBubbleMode mode, |
| 154 const signin::ManageAccountsParams& manage_accounts_params) override; | 152 const signin::ManageAccountsParams& manage_accounts_params) override; |
| 155 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; | 153 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; |
| 156 void ExecuteExtensionCommand(const extensions::Extension* extension, | 154 void ExecuteExtensionCommand(const extensions::Extension* extension, |
| 157 const extensions::Command& command) override; | 155 const extensions::Command& command) override; |
| 158 | 156 |
| 159 // Overridden from ExtensionKeybindingRegistry::Delegate: | 157 // Overridden from ExtensionKeybindingRegistry::Delegate: |
| 160 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() | 158 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() |
| 161 override; | 159 override; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 177 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 175 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
| 178 | 176 |
| 179 Browser* browser_; // weak, owned by controller | 177 Browser* browser_; // weak, owned by controller |
| 180 BrowserWindowController* controller_; // weak, owns us | 178 BrowserWindowController* controller_; // weak, owns us |
| 181 base::scoped_nsobject<NSString> pending_window_title_; | 179 base::scoped_nsobject<NSString> pending_window_title_; |
| 182 ui::WindowShowState initial_show_state_; | 180 ui::WindowShowState initial_show_state_; |
| 183 NSInteger attention_request_id_; // identifier from requestUserAttention | 181 NSInteger attention_request_id_; // identifier from requestUserAttention |
| 184 }; | 182 }; |
| 185 | 183 |
| 186 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 184 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
| OLD | NEW |