chrome/browser/ui/extensions/shell_window.cc - 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/extensions/shell_window.cc

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/ui/extensions/shell_window.h ('k') | chrome/browser/ui/gtk/color_chooser_gtk.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/extensions/shell_window.cc

diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc

index 2f0ed304114eb6997aef8da5c8cf6028af998ca0..ec2ebbed2ce4441dc0b43c0cef9a86fc203528ad 100644

--- a/chrome/browser/ui/extensions/shell_window.cc

+++ b/chrome/browser/ui/extensions/shell_window.cc

@@ -30,6 +30,7 @@

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_messages.h"

#include "chrome/common/extensions/manifest_handlers/icons_handler.h"

+#include "content/public/browser/color_chooser.h"

#include "content/public/browser/invalidate_type.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/notification_details.h"

@@ -465,6 +466,11 @@ bool ShellWindow::ShouldSuppressDialogs() {

return true;

}

+content::ColorChooser* ShellWindow::OpenColorChooser(WebContents* web_contents,

+ SkColor initial_color) {

+ return content::ColorChooser::Open(web_contents, initial_color);

void ShellWindow::RunFileChooser(WebContents* tab,

const content::FileChooserParams& params) {

FileSelectHelper::RunFileChooser(tab, params);