chrome/browser/ui/browser.h - Issue 13150004: Support color chooser inside extesions, apps, chrome frame, dev tool

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: Removed chrome/browser/ui/color_chooser.cc Created 7 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/ui/browser.cc » ('j') | components/web_contents_delegate_android/color_chooser_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.h

diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h

index f3d3cecf693e5f8ef79d34e8bf926047064bc754..bd92383fc9c18855ba9e8e131a078e8b2678aa8e 100644

--- a/chrome/browser/ui/browser.h

+++ b/chrome/browser/ui/browser.h

@@ -583,10 +583,7 @@ class Browser : public TabStripModelObserver,

virtual content::JavaScriptDialogManager*

GetJavaScriptDialogManager() OVERRIDE;

virtual content::ColorChooser* OpenColorChooser(

- content::WebContents* web_contents,

- int color_chooser_id,

- SkColor color) OVERRIDE;

- virtual void DidEndColorChooser() OVERRIDE;

+ content::WebContents* web_contents, SkColor color) OVERRIDE;

virtual void RunFileChooser(

content::WebContents* web_contents,

const content::FileChooserParams& params) OVERRIDE;

@@ -917,10 +914,6 @@ class Browser : public TabStripModelObserver,

// True if the browser window has been shown at least once.

bool window_has_shown_;

- // Currently open color chooser. Non-NULL after OpenColorChooser is called and

- // before DidEndColorChooser is called.

- scoped_ptr<content::ColorChooser> color_chooser_;

DISALLOW_COPY_AND_ASSIGN(Browser);

};