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

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: added content::ColorChooser Created 8 years, 9 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 SkBitmap; 67 class SkBitmap;
67 class StatusBubble; 68 class StatusBubble;
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 virtual void ContentRestrictionsChanged( 1008 virtual void ContentRestrictionsChanged(
1008 content::WebContents* source) OVERRIDE; 1009 content::WebContents* source) OVERRIDE;
1009 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; 1010 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
1010 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; 1011 virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
1011 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; 1012 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE;
1012 virtual void DidNavigateMainFramePostCommit( 1013 virtual void DidNavigateMainFramePostCommit(
1013 content::WebContents* tab) OVERRIDE; 1014 content::WebContents* tab) OVERRIDE;
1014 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE; 1015 virtual void DidNavigateToPendingEntry(content::WebContents* tab) OVERRIDE;
1015 virtual content::JavaScriptDialogCreator* 1016 virtual content::JavaScriptDialogCreator*
1016 GetJavaScriptDialogCreator() OVERRIDE; 1017 GetJavaScriptDialogCreator() OVERRIDE;
1018 virtual content::ColorChooser* OpenColorChooser(content::WebContents* tab,
1019 int color_chooser_id,
1020 const SkColor& color) OVERRIDE;
1021 virtual void DidEndColorChooser() OVERRIDE;
1017 virtual void RunFileChooser( 1022 virtual void RunFileChooser(
1018 content::WebContents* tab, 1023 content::WebContents* tab,
1019 const content::FileChooserParams& params) OVERRIDE; 1024 const content::FileChooserParams& params) OVERRIDE;
1020 virtual void EnumerateDirectory(content::WebContents* tab, int request_id, 1025 virtual void EnumerateDirectory(content::WebContents* tab, int request_id,
1021 const FilePath& path) OVERRIDE; 1026 const FilePath& path) OVERRIDE;
1022 virtual void ToggleFullscreenModeForTab(content::WebContents* tab, 1027 virtual void ToggleFullscreenModeForTab(content::WebContents* tab,
1023 bool enter_fullscreen) OVERRIDE; 1028 bool enter_fullscreen) OVERRIDE;
1024 virtual bool IsFullscreenForTab( 1029 virtual bool IsFullscreenForTab(
1025 const content::WebContents* tab) const OVERRIDE; 1030 const content::WebContents* tab) const OVERRIDE;
1026 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; 1031 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE;
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 scoped_ptr<InstantController> instant_; 1458 scoped_ptr<InstantController> instant_;
1454 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1459 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1455 1460
1456 BookmarkBar::State bookmark_bar_state_; 1461 BookmarkBar::State bookmark_bar_state_;
1457 1462
1458 scoped_refptr<FullscreenController> fullscreen_controller_; 1463 scoped_refptr<FullscreenController> fullscreen_controller_;
1459 1464
1460 // True if the browser window has been shown at least once. 1465 // True if the browser window has been shown at least once.
1461 bool window_has_shown_; 1466 bool window_has_shown_;
1462 1467
1468 scoped_ptr<ColorChooser> color_chooser_;
1469
1463 DISALLOW_COPY_AND_ASSIGN(Browser); 1470 DISALLOW_COPY_AND_ASSIGN(Browser);
1464 }; 1471 };
1465 1472
1466 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1473 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698