Chromium Code Reviews| Index: chrome/browser/ui/browser.cc |
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
| index 3a3e35fad37676e05457023a605953f298dd5f5a..cacb5c9cfb400e53e9feed75d1d342508a34a581 100644 |
| --- a/chrome/browser/ui/browser.cc |
| +++ b/chrome/browser/ui/browser.cc |
| @@ -108,6 +108,7 @@ |
| #include "chrome/browser/ui/browser_navigator.h" |
| #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" |
| #include "chrome/browser/ui/browser_window.h" |
| +#include "chrome/browser/ui/color_chooser.h" |
| #include "chrome/browser/ui/constrained_window_tab_helper.h" |
| #include "chrome/browser/ui/extensions/shell_window.h" |
| #include "chrome/browser/ui/find_bar/find_bar.h" |
| @@ -150,6 +151,7 @@ |
| #include "chrome/common/web_apps.h" |
| #include "content/browser/browser_url_handler.h" |
| #include "content/browser/renderer_host/render_view_host.h" |
| +#include "content/public/browser/color_chooser.h" |
| #include "content/public/browser/devtools_manager.h" |
| #include "content/public/browser/download_item.h" |
| #include "content/public/browser/download_manager.h" |
| @@ -4118,6 +4120,25 @@ content::JavaScriptDialogCreator* Browser::GetJavaScriptDialogCreator() { |
| return GetJavaScriptDialogCreatorInstance(); |
| } |
| +content::ColorChooser* Browser::OpenColorChooser(WebContents* tab, |
| + int color_chooser_id, |
| + const SkColor& color) { |
| + if (color_chooser_.get() && |
| + color_chooser_id == color_chooser_->GetIdentifier() && |
| + tab->GetRenderViewHost() == color_chooser_->GetRenderViewHost()) |
| + return NULL; |
|
jam
2012/02/27 22:06:25
I don't think this condition can happen?
i.e. whe
keishi
2012/02/28 11:27:45
Yes, it should never happen. Removed.
|
| + if (color_chooser_.get()) |
| + color_chooser_->End(); |
| + color_chooser_.reset(ColorChooser::Create(color_chooser_id, |
| + tab->GetRenderViewHost(), |
| + color)); |
| + return static_cast<content::ColorChooser*>(color_chooser_.get()); |
| +} |
| + |
| +void Browser::DidEndColorChooser() { |
| + color_chooser_.reset(); |
| +} |
| + |
| void Browser::RunFileChooser(WebContents* tab, |
| const content::FileChooserParams& params) { |
| RunFileChooserHelper(tab, params); |