Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 9203001: Implement input type=color UI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed issues/removed color_select_helper/added color_chooser_id Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 class InstantController; 62 class InstantController;
63 class InstantUnloadHandler; 63 class InstantUnloadHandler;
64 class PrefService; 64 class PrefService;
65 class Profile; 65 class Profile;
66 class SessionStorageNamespace; 66 class SessionStorageNamespace;
67 class SkBitmap; 67 class SkBitmap;
68 class StatusBubble; 68 class StatusBubble;
69 class TabNavigation; 69 class TabNavigation;
70 class TabStripModel; 70 class TabStripModel;
71 struct WebApplicationInfo; 71 struct WebApplicationInfo;
72 class ColorChooser;
Peter Kasting 2012/02/07 01:46:24 Nit: Declare in alphabetical order
keishi 2012/02/17 11:31:05 Done.
72 73
73 namespace content { 74 namespace content {
74 class NavigationController; 75 class NavigationController;
75 } 76 }
76 77
77 namespace gfx { 78 namespace gfx {
78 class Point; 79 class Point;
79 } 80 }
80 81
81 class Browser : public TabHandlerDelegate, 82 class Browser : public TabHandlerDelegate,
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 virtual void ContentRestrictionsChanged( 992 virtual void ContentRestrictionsChanged(
992 content::WebContents* source) OVERRIDE; 993 content::WebContents* source) OVERRIDE;
993 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; 994 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
994 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; 995 virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
995 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; 996 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE;
996 virtual void DidNavigateMainFramePostCommit( 997 virtual void DidNavigateMainFramePostCommit(
997 content::WebContents* tab) OVERRIDE; 998 content::WebContents* tab) OVERRIDE;
998 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE; 999 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE;
999 virtual content::JavaScriptDialogCreator* 1000 virtual content::JavaScriptDialogCreator*
1000 GetJavaScriptDialogCreator() OVERRIDE; 1001 GetJavaScriptDialogCreator() OVERRIDE;
1002 virtual void OpenColorChooser(content::WebContents* tab,
1003 unsigned color_chooser_id,
1004 const SkColor& color) OVERRIDE;
1005 virtual void EndColorChooser(content::WebContents* tab,
1006 unsigned color_chooser_id) OVERRIDE;
1007 virtual void SetSelectedColorInColorChooser(content::WebContents* tab,
1008 unsigned color_chooser_id,
1009 const SkColor& color) OVERRIDE;
1010 virtual void DidEndColorChooser(content::WebContents* tab) OVERRIDE;
1001 virtual void RunFileChooser( 1011 virtual void RunFileChooser(
1002 content::WebContents* tab, 1012 content::WebContents* tab,
1003 const content::FileChooserParams& params) OVERRIDE; 1013 const content::FileChooserParams& params) OVERRIDE;
1004 virtual void EnumerateDirectory(content::WebContents* tab, int request_id, 1014 virtual void EnumerateDirectory(content::WebContents* tab, int request_id,
1005 const FilePath& path) OVERRIDE; 1015 const FilePath& path) OVERRIDE;
1006 virtual void ToggleFullscreenModeForTab(content::WebContents* tab, 1016 virtual void ToggleFullscreenModeForTab(content::WebContents* tab,
1007 bool enter_fullscreen) OVERRIDE; 1017 bool enter_fullscreen) OVERRIDE;
1008 virtual bool IsFullscreenForTab( 1018 virtual bool IsFullscreenForTab(
1009 const content::WebContents* tab) const OVERRIDE; 1019 const content::WebContents* tab) const OVERRIDE;
1010 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; 1020 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE;
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
1441 scoped_ptr<InstantController> instant_; 1451 scoped_ptr<InstantController> instant_;
1442 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1452 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1443 1453
1444 BookmarkBar::State bookmark_bar_state_; 1454 BookmarkBar::State bookmark_bar_state_;
1445 1455
1446 scoped_refptr<FullscreenController> fullscreen_controller_; 1456 scoped_refptr<FullscreenController> fullscreen_controller_;
1447 1457
1448 // True if the browser window has been shown at least once. 1458 // True if the browser window has been shown at least once.
1449 bool window_has_shown_; 1459 bool window_has_shown_;
1450 1460
1461 scoped_ptr<ColorChooser> color_chooser_;
1462
1451 DISALLOW_COPY_AND_ASSIGN(Browser); 1463 DISALLOW_COPY_AND_ASSIGN(Browser);
1452 }; 1464 };
1453 1465
1454 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1466 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698