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" |
| 11 #include "chrome/browser/signin/signin_header_helper.h" |
11 #include "chrome/browser/ui/browser_window.h" | 12 #include "chrome/browser/ui/browser_window.h" |
12 #include "chrome/browser/ui/search/search_model_observer.h" | 13 #include "chrome/browser/ui/search/search_model_observer.h" |
13 #include "components/bookmarks/browser/bookmark_model.h" | 14 #include "components/bookmarks/browser/bookmark_model.h" |
14 #include "ui/base/ui_base_types.h" | 15 #include "ui/base/ui_base_types.h" |
15 | 16 |
16 class Browser; | 17 class Browser; |
17 @class BrowserWindowController; | 18 @class BrowserWindowController; |
18 @class FindBarCocoaController; | 19 @class FindBarCocoaController; |
19 @class NSEvent; | 20 @class NSEvent; |
20 @class NSMenu; | 21 @class NSMenu; |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 virtual void EnterFullscreenWithChrome() OVERRIDE; | 142 virtual void EnterFullscreenWithChrome() OVERRIDE; |
142 virtual bool IsFullscreenWithChrome() OVERRIDE; | 143 virtual bool IsFullscreenWithChrome() OVERRIDE; |
143 virtual bool IsFullscreenWithoutChrome() OVERRIDE; | 144 virtual bool IsFullscreenWithoutChrome() OVERRIDE; |
144 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 145 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
145 const gfx::Rect& bounds) OVERRIDE; | 146 const gfx::Rect& bounds) OVERRIDE; |
146 virtual FindBar* CreateFindBar() OVERRIDE; | 147 virtual FindBar* CreateFindBar() OVERRIDE; |
147 virtual web_modal::WebContentsModalDialogHost* | 148 virtual web_modal::WebContentsModalDialogHost* |
148 GetWebContentsModalDialogHost() OVERRIDE; | 149 GetWebContentsModalDialogHost() OVERRIDE; |
149 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 150 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
150 const gfx::Rect& rect) OVERRIDE; | 151 const gfx::Rect& rect) OVERRIDE; |
151 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode) OVERRIDE; | 152 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, |
| 153 signin::GAIAServiceType service_type) OVERRIDE; |
152 virtual void ShowPasswordGenerationBubble( | 154 virtual void ShowPasswordGenerationBubble( |
153 const gfx::Rect& rect, | 155 const gfx::Rect& rect, |
154 const autofill::PasswordForm& form, | 156 const autofill::PasswordForm& form, |
155 autofill::PasswordGenerator* password_generator) OVERRIDE; | 157 autofill::PasswordGenerator* password_generator) OVERRIDE; |
156 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; | 158 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; |
157 virtual void ExecuteExtensionCommand( | 159 virtual void ExecuteExtensionCommand( |
158 const extensions::Extension* extension, | 160 const extensions::Extension* extension, |
159 const extensions::Command& command) OVERRIDE; | 161 const extensions::Command& command) OVERRIDE; |
160 virtual void ShowPageActionPopup( | 162 virtual void ShowPageActionPopup( |
161 const extensions::Extension* extension) OVERRIDE; | 163 const extensions::Extension* extension) OVERRIDE; |
(...skipping 21 matching lines...) Expand all Loading... |
183 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 185 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
184 | 186 |
185 Browser* browser_; // weak, owned by controller | 187 Browser* browser_; // weak, owned by controller |
186 BrowserWindowController* controller_; // weak, owns us | 188 BrowserWindowController* controller_; // weak, owns us |
187 base::scoped_nsobject<NSString> pending_window_title_; | 189 base::scoped_nsobject<NSString> pending_window_title_; |
188 ui::WindowShowState initial_show_state_; | 190 ui::WindowShowState initial_show_state_; |
189 NSInteger attention_request_id_; // identifier from requestUserAttention | 191 NSInteger attention_request_id_; // identifier from requestUserAttention |
190 }; | 192 }; |
191 | 193 |
192 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 194 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
OLD | NEW |