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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 GetActiveTabPermissionGranter() OVERRIDE; | 267 GetActiveTabPermissionGranter() OVERRIDE; |
268 | 268 |
269 // WebContentsModalDialogManagerDelegate implementation. | 269 // WebContentsModalDialogManagerDelegate implementation. |
270 virtual void SetWebContentsBlocked(content::WebContents* web_contents, | 270 virtual void SetWebContentsBlocked(content::WebContents* web_contents, |
271 bool blocked) OVERRIDE; | 271 bool blocked) OVERRIDE; |
272 | 272 |
273 virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE; | 273 virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE; |
274 | 274 |
275 // Callback from web_contents()->DownloadFavicon. | 275 // Callback from web_contents()->DownloadFavicon. |
276 void DidDownloadFavicon(int id, | 276 void DidDownloadFavicon(int id, |
| 277 int http_status_code, |
277 const GURL& image_url, | 278 const GURL& image_url, |
278 int requested_size, | 279 int requested_size, |
279 const std::vector<SkBitmap>& bitmaps); | 280 const std::vector<SkBitmap>& bitmaps); |
280 | 281 |
281 Profile* profile_; // weak pointer - owned by ProfileManager. | 282 Profile* profile_; // weak pointer - owned by ProfileManager. |
282 // weak pointer - owned by ExtensionService. | 283 // weak pointer - owned by ExtensionService. |
283 const extensions::Extension* extension_; | 284 const extensions::Extension* extension_; |
284 | 285 |
285 // Identifier that is used when saving and restoring geometry for this | 286 // Identifier that is used when saving and restoring geometry for this |
286 // window. | 287 // window. |
(...skipping 17 matching lines...) Expand all Loading... |
304 | 305 |
305 // Fullscreen entered by app.window api. | 306 // Fullscreen entered by app.window api. |
306 bool fullscreen_for_window_api_; | 307 bool fullscreen_for_window_api_; |
307 // Fullscreen entered by HTML requestFullscreen. | 308 // Fullscreen entered by HTML requestFullscreen. |
308 bool fullscreen_for_tab_; | 309 bool fullscreen_for_tab_; |
309 | 310 |
310 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 311 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
311 }; | 312 }; |
312 | 313 |
313 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ | 314 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ |
OLD | NEW |