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

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

Issue 13150004: Support color chooser inside extesions, apps, chrome frame, dev tool (Closed) Base URL: http://git.chromium.org/chromium/src.git@ngcolor
Patch Set: Rebased Created 7 years, 7 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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; 575 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
576 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; 576 virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
577 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; 577 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE;
578 virtual void DidNavigateMainFramePostCommit( 578 virtual void DidNavigateMainFramePostCommit(
579 content::WebContents* web_contents) OVERRIDE; 579 content::WebContents* web_contents) OVERRIDE;
580 virtual void DidNavigateToPendingEntry( 580 virtual void DidNavigateToPendingEntry(
581 content::WebContents* web_contents) OVERRIDE; 581 content::WebContents* web_contents) OVERRIDE;
582 virtual content::JavaScriptDialogManager* 582 virtual content::JavaScriptDialogManager*
583 GetJavaScriptDialogManager() OVERRIDE; 583 GetJavaScriptDialogManager() OVERRIDE;
584 virtual content::ColorChooser* OpenColorChooser( 584 virtual content::ColorChooser* OpenColorChooser(
585 content::WebContents* web_contents, 585 content::WebContents* web_contents, SkColor color) OVERRIDE;
586 int color_chooser_id,
587 SkColor color) OVERRIDE;
588 virtual void DidEndColorChooser() OVERRIDE;
589 virtual void RunFileChooser( 586 virtual void RunFileChooser(
590 content::WebContents* web_contents, 587 content::WebContents* web_contents,
591 const content::FileChooserParams& params) OVERRIDE; 588 const content::FileChooserParams& params) OVERRIDE;
592 virtual void EnumerateDirectory(content::WebContents* web_contents, 589 virtual void EnumerateDirectory(content::WebContents* web_contents,
593 int request_id, 590 int request_id,
594 const base::FilePath& path) OVERRIDE; 591 const base::FilePath& path) OVERRIDE;
595 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, 592 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
596 bool enter_fullscreen) OVERRIDE; 593 bool enter_fullscreen) OVERRIDE;
597 virtual bool IsFullscreenForTabOrPending( 594 virtual bool IsFullscreenForTabOrPending(
598 const content::WebContents* web_contents) const OVERRIDE; 595 const content::WebContents* web_contents) const OVERRIDE;
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 906
910 scoped_ptr<FullscreenController> fullscreen_controller_; 907 scoped_ptr<FullscreenController> fullscreen_controller_;
911 908
912 scoped_ptr<extensions::WindowController> extension_window_controller_; 909 scoped_ptr<extensions::WindowController> extension_window_controller_;
913 910
914 scoped_ptr<chrome::BrowserCommandController> command_controller_; 911 scoped_ptr<chrome::BrowserCommandController> command_controller_;
915 912
916 // True if the browser window has been shown at least once. 913 // True if the browser window has been shown at least once.
917 bool window_has_shown_; 914 bool window_has_shown_;
918 915
919 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
920 // before DidEndColorChooser is called.
921 scoped_ptr<content::ColorChooser> color_chooser_;
922
923 DISALLOW_COPY_AND_ASSIGN(Browser); 916 DISALLOW_COPY_AND_ASSIGN(Browser);
924 }; 917 };
925 918
926 #endif // CHROME_BROWSER_UI_BROWSER_H_ 919 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698