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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 Profile* profile) OVERRIDE; | 102 Profile* profile) OVERRIDE; |
103 virtual void ShowUpdateChromeDialog() OVERRIDE; | 103 virtual void ShowUpdateChromeDialog() OVERRIDE; |
104 virtual void ShowBookmarkBubble(const GURL& url, | 104 virtual void ShowBookmarkBubble(const GURL& url, |
105 bool already_bookmarked) OVERRIDE; | 105 bool already_bookmarked) OVERRIDE; |
106 virtual void ShowBookmarkAppBubble( | 106 virtual void ShowBookmarkAppBubble( |
107 const WebApplicationInfo& web_app_info, | 107 const WebApplicationInfo& web_app_info, |
108 const std::string& extension_id) OVERRIDE; | 108 const std::string& extension_id) OVERRIDE; |
109 virtual void ShowTranslateBubble( | 109 virtual void ShowTranslateBubble( |
110 content::WebContents* contents, | 110 content::WebContents* contents, |
111 translate::TranslateStep step, | 111 translate::TranslateStep step, |
112 translate::TranslateErrors::Type error_type) OVERRIDE; | 112 translate::TranslateErrors::Type error_type, |
| 113 bool is_user_gesture) OVERRIDE; |
113 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 114 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
114 virtual void ShowOneClickSigninBubble( | 115 virtual void ShowOneClickSigninBubble( |
115 OneClickSigninBubbleType type, | 116 OneClickSigninBubbleType type, |
116 const base::string16& email, | 117 const base::string16& email, |
117 const base::string16& error_message, | 118 const base::string16& error_message, |
118 const StartSyncCallback& start_sync_callback) OVERRIDE; | 119 const StartSyncCallback& start_sync_callback) OVERRIDE; |
119 #endif | 120 #endif |
120 virtual bool IsDownloadShelfVisible() const OVERRIDE; | 121 virtual bool IsDownloadShelfVisible() const OVERRIDE; |
121 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; | 122 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; |
122 virtual void ConfirmBrowserCloseWithPendingDownloads( | 123 virtual void ConfirmBrowserCloseWithPendingDownloads( |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 187 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
187 | 188 |
188 Browser* browser_; // weak, owned by controller | 189 Browser* browser_; // weak, owned by controller |
189 BrowserWindowController* controller_; // weak, owns us | 190 BrowserWindowController* controller_; // weak, owns us |
190 base::scoped_nsobject<NSString> pending_window_title_; | 191 base::scoped_nsobject<NSString> pending_window_title_; |
191 ui::WindowShowState initial_show_state_; | 192 ui::WindowShowState initial_show_state_; |
192 NSInteger attention_request_id_; // identifier from requestUserAttention | 193 NSInteger attention_request_id_; // identifier from requestUserAttention |
193 }; | 194 }; |
194 | 195 |
195 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 196 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
OLD | NEW |