components/web_contents_delegate_android/web_contents_delegate_android.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: components/web_contents_delegate_android/web_contents_delegate_android.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: Fixed android build 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/web_contents_delegate_android/color_chooser_android.cc ('k') | components/web_contents_delegate_android/web_contents_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_contents_delegate_android/web_contents_delegate_android.h

diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h

index ec90ac384136b1b7167d8dd77815aaee0f916a32..26fc22f3770da2d399286a0d3731fed2b84dc7dc 100644

--- a/components/web_contents_delegate_android/web_contents_delegate_android.h

+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h

@@ -52,10 +52,8 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {

virtual content::WebContents* OpenURLFromTab(

content::WebContents* source,

const content::OpenURLParams& params) OVERRIDE;

- virtual content::ColorChooser* OpenColorChooser(

- content::WebContents* source, int color_chooser_id,

- SkColor color) OVERRIDE;

+ virtual content::ColorChooser* OpenColorChooser(content::WebContents* source,

+ SkColor color) OVERRIDE;

virtual void NavigationStateChanged(const content::WebContents* source,

unsigned changed_flags) OVERRIDE;

virtual void AddNewContents(content::WebContents* source,