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_EXTENSIONS_SHELL_WINDOW_H_ | 5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ |
6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ | 6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 GetActiveTabPermissionGranter() OVERRIDE; | 262 GetActiveTabPermissionGranter() OVERRIDE; |
263 | 263 |
264 // WebContentsModalDialogManagerDelegate implementation. | 264 // WebContentsModalDialogManagerDelegate implementation. |
265 virtual void SetWebContentsBlocked(content::WebContents* web_contents, | 265 virtual void SetWebContentsBlocked(content::WebContents* web_contents, |
266 bool blocked) OVERRIDE; | 266 bool blocked) OVERRIDE; |
267 | 267 |
268 virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE; | 268 virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE; |
269 | 269 |
270 // Callback from web_contents()->DownloadFavicon. | 270 // Callback from web_contents()->DownloadFavicon. |
271 void DidDownloadFavicon(int id, | 271 void DidDownloadFavicon(int id, |
| 272 int http_status_code, |
272 const GURL& image_url, | 273 const GURL& image_url, |
273 int requested_size, | 274 int requested_size, |
274 const std::vector<SkBitmap>& bitmaps); | 275 const std::vector<SkBitmap>& bitmaps); |
275 | 276 |
276 Profile* profile_; // weak pointer - owned by ProfileManager. | 277 Profile* profile_; // weak pointer - owned by ProfileManager. |
277 // weak pointer - owned by ExtensionService. | 278 // weak pointer - owned by ExtensionService. |
278 const extensions::Extension* extension_; | 279 const extensions::Extension* extension_; |
279 const std::string extension_id_; | 280 const std::string extension_id_; |
280 | 281 |
281 // Identifier that is used when saving and restoring geometry for this | 282 // Identifier that is used when saving and restoring geometry for this |
(...skipping 18 matching lines...) Expand all Loading... |
300 | 301 |
301 // Fullscreen entered by app.window api. | 302 // Fullscreen entered by app.window api. |
302 bool fullscreen_for_window_api_; | 303 bool fullscreen_for_window_api_; |
303 // Fullscreen entered by HTML requestFullscreen. | 304 // Fullscreen entered by HTML requestFullscreen. |
304 bool fullscreen_for_tab_; | 305 bool fullscreen_for_tab_; |
305 | 306 |
306 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 307 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
307 }; | 308 }; |
308 | 309 |
309 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ | 310 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ |
OLD | NEW |