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

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: Created 7 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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 virtual void DidNavigateMainFramePostCommit( 580 virtual void DidNavigateMainFramePostCommit(
581 content::WebContents* web_contents) OVERRIDE; 581 content::WebContents* web_contents) OVERRIDE;
582 virtual void DidNavigateToPendingEntry( 582 virtual void DidNavigateToPendingEntry(
583 content::WebContents* web_contents) OVERRIDE; 583 content::WebContents* web_contents) OVERRIDE;
584 virtual content::JavaScriptDialogManager* 584 virtual content::JavaScriptDialogManager*
585 GetJavaScriptDialogManager() OVERRIDE; 585 GetJavaScriptDialogManager() OVERRIDE;
586 virtual content::ColorChooser* OpenColorChooser( 586 virtual content::ColorChooser* OpenColorChooser(
587 content::WebContents* web_contents, 587 content::WebContents* web_contents,
588 int color_chooser_id, 588 int color_chooser_id,
589 SkColor color) OVERRIDE; 589 SkColor color) OVERRIDE;
590 virtual void DidEndColorChooser() OVERRIDE;
591 virtual void RunFileChooser( 590 virtual void RunFileChooser(
592 content::WebContents* web_contents, 591 content::WebContents* web_contents,
593 const content::FileChooserParams& params) OVERRIDE; 592 const content::FileChooserParams& params) OVERRIDE;
594 virtual void EnumerateDirectory(content::WebContents* web_contents, 593 virtual void EnumerateDirectory(content::WebContents* web_contents,
595 int request_id, 594 int request_id,
596 const base::FilePath& path) OVERRIDE; 595 const base::FilePath& path) OVERRIDE;
597 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, 596 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
598 bool enter_fullscreen) OVERRIDE; 597 bool enter_fullscreen) OVERRIDE;
599 virtual bool IsFullscreenForTabOrPending( 598 virtual bool IsFullscreenForTabOrPending(
600 const content::WebContents* web_contents) const OVERRIDE; 599 const content::WebContents* web_contents) const OVERRIDE;
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 909
911 scoped_ptr<FullscreenController> fullscreen_controller_; 910 scoped_ptr<FullscreenController> fullscreen_controller_;
912 911
913 scoped_ptr<extensions::WindowController> extension_window_controller_; 912 scoped_ptr<extensions::WindowController> extension_window_controller_;
914 913
915 scoped_ptr<chrome::BrowserCommandController> command_controller_; 914 scoped_ptr<chrome::BrowserCommandController> command_controller_;
916 915
917 // True if the browser window has been shown at least once. 916 // True if the browser window has been shown at least once.
918 bool window_has_shown_; 917 bool window_has_shown_;
919 918
920 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
921 // before DidEndColorChooser is called.
922 scoped_ptr<content::ColorChooser> color_chooser_;
923
924 DISALLOW_COPY_AND_ASSIGN(Browser); 919 DISALLOW_COPY_AND_ASSIGN(Browser);
925 }; 920 };
926 921
927 #endif // CHROME_BROWSER_UI_BROWSER_H_ 922 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698