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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 #include "content/public/browser/page_navigator.h" | 48 #include "content/public/browser/page_navigator.h" |
49 #include "content/public/browser/web_contents_delegate.h" | 49 #include "content/public/browser/web_contents_delegate.h" |
50 #include "content/public/common/page_transition_types.h" | 50 #include "content/public/common/page_transition_types.h" |
51 #include "content/public/common/page_zoom.h" | 51 #include "content/public/common/page_zoom.h" |
52 #include "ui/base/ui_base_types.h" | 52 #include "ui/base/ui_base_types.h" |
53 #include "ui/gfx/rect.h" | 53 #include "ui/gfx/rect.h" |
54 | 54 |
55 class BrowserSyncedWindowDelegate; | 55 class BrowserSyncedWindowDelegate; |
56 class BrowserTabRestoreServiceDelegate; | 56 class BrowserTabRestoreServiceDelegate; |
57 class BrowserWindow; | 57 class BrowserWindow; |
58 class ColorChooser; | |
58 class Extension; | 59 class Extension; |
59 class FindBarController; | 60 class FindBarController; |
60 class FullscreenController; | 61 class FullscreenController; |
61 class HtmlDialogUIDelegate; | 62 class HtmlDialogUIDelegate; |
62 class InstantController; | 63 class InstantController; |
63 class InstantUnloadHandler; | 64 class InstantUnloadHandler; |
64 class PrefService; | 65 class PrefService; |
65 class Profile; | 66 class Profile; |
66 class SessionStorageNamespace; | 67 class SessionStorageNamespace; |
67 class SkBitmap; | 68 class SkBitmap; |
(...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
994 virtual void ContentRestrictionsChanged( | 995 virtual void ContentRestrictionsChanged( |
995 content::WebContents* source) OVERRIDE; | 996 content::WebContents* source) OVERRIDE; |
996 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 997 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
997 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 998 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
998 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 999 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
999 virtual void DidNavigateMainFramePostCommit( | 1000 virtual void DidNavigateMainFramePostCommit( |
1000 content::WebContents* tab) OVERRIDE; | 1001 content::WebContents* tab) OVERRIDE; |
1001 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE; | 1002 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE; |
1002 virtual content::JavaScriptDialogCreator* | 1003 virtual content::JavaScriptDialogCreator* |
1003 GetJavaScriptDialogCreator() OVERRIDE; | 1004 GetJavaScriptDialogCreator() OVERRIDE; |
1005 virtual void OpenColorChooser(content::WebContents* tab, | |
1006 int color_chooser_id, | |
1007 const SkColor& color) OVERRIDE; | |
1008 virtual void EndColorChooser(content::WebContents* tab, | |
1009 int color_chooser_id) OVERRIDE; | |
1010 virtual void SetSelectedColorInColorChooser(content::WebContents* tab, | |
1011 int color_chooser_id, | |
1012 const SkColor& color) OVERRIDE; | |
1004 virtual void RunFileChooser( | 1013 virtual void RunFileChooser( |
1005 content::WebContents* tab, | 1014 content::WebContents* tab, |
1006 const content::FileChooserParams& params) OVERRIDE; | 1015 const content::FileChooserParams& params) OVERRIDE; |
1007 virtual void EnumerateDirectory(content::WebContents* tab, int request_id, | 1016 virtual void EnumerateDirectory(content::WebContents* tab, int request_id, |
1008 const FilePath& path) OVERRIDE; | 1017 const FilePath& path) OVERRIDE; |
1009 virtual void ToggleFullscreenModeForTab(content::WebContents* tab, | 1018 virtual void ToggleFullscreenModeForTab(content::WebContents* tab, |
1010 bool enter_fullscreen) OVERRIDE; | 1019 bool enter_fullscreen) OVERRIDE; |
1011 virtual bool IsFullscreenForTab( | 1020 virtual bool IsFullscreenForTab( |
1012 const content::WebContents* tab) const OVERRIDE; | 1021 const content::WebContents* tab) const OVERRIDE; |
1013 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; | 1022 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1444 scoped_ptr<InstantController> instant_; | 1453 scoped_ptr<InstantController> instant_; |
1445 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1454 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1446 | 1455 |
1447 BookmarkBar::State bookmark_bar_state_; | 1456 BookmarkBar::State bookmark_bar_state_; |
1448 | 1457 |
1449 scoped_refptr<FullscreenController> fullscreen_controller_; | 1458 scoped_refptr<FullscreenController> fullscreen_controller_; |
1450 | 1459 |
1451 // True if the browser window has been shown at least once. | 1460 // True if the browser window has been shown at least once. |
1452 bool window_has_shown_; | 1461 bool window_has_shown_; |
1453 | 1462 |
1463 scoped_ptr<ColorChooser> color_chooser_; | |
jam
2012/02/22 02:55:20
it doesn't look like this gets destroyed after it'
keishi
2012/02/24 14:38:54
I forgot to add color_chooser_.reset() to EndColor
| |
1464 | |
1454 DISALLOW_COPY_AND_ASSIGN(Browser); | 1465 DISALLOW_COPY_AND_ASSIGN(Browser); |
1455 }; | 1466 }; |
1456 | 1467 |
1457 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1468 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |