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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 9203001: Implement input type=color UI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed issues Created 8 years, 10 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 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "chrome/browser/themes/theme_service.h" 100 #include "chrome/browser/themes/theme_service.h"
101 #include "chrome/browser/themes/theme_service_factory.h" 101 #include "chrome/browser/themes/theme_service_factory.h"
102 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" 102 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
103 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 103 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
104 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 104 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
105 #include "chrome/browser/ui/browser_dialogs.h" 105 #include "chrome/browser/ui/browser_dialogs.h"
106 #include "chrome/browser/ui/browser_list.h" 106 #include "chrome/browser/ui/browser_list.h"
107 #include "chrome/browser/ui/browser_navigator.h" 107 #include "chrome/browser/ui/browser_navigator.h"
108 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" 108 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
109 #include "chrome/browser/ui/browser_window.h" 109 #include "chrome/browser/ui/browser_window.h"
110 #include "chrome/browser/ui/color_chooser.h"
110 #include "chrome/browser/ui/constrained_window_tab_helper.h" 111 #include "chrome/browser/ui/constrained_window_tab_helper.h"
111 #include "chrome/browser/ui/extensions/shell_window.h" 112 #include "chrome/browser/ui/extensions/shell_window.h"
112 #include "chrome/browser/ui/find_bar/find_bar.h" 113 #include "chrome/browser/ui/find_bar/find_bar.h"
113 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 114 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
114 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 115 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
115 #include "chrome/browser/ui/fullscreen_controller.h" 116 #include "chrome/browser/ui/fullscreen_controller.h"
116 #include "chrome/browser/ui/global_error.h" 117 #include "chrome/browser/ui/global_error.h"
117 #include "chrome/browser/ui/global_error_service.h" 118 #include "chrome/browser/ui/global_error_service.h"
118 #include "chrome/browser/ui/global_error_service_factory.h" 119 #include "chrome/browser/ui/global_error_service_factory.h"
119 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" 120 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
(...skipping 3933 matching lines...) Expand 10 before | Expand all | Expand 10 after
4053 4054
4054 void Browser::DidNavigateToPendingEntry(WebContents* tab) { 4055 void Browser::DidNavigateToPendingEntry(WebContents* tab) {
4055 if (tab == GetSelectedWebContents()) 4056 if (tab == GetSelectedWebContents())
4056 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); 4057 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
4057 } 4058 }
4058 4059
4059 content::JavaScriptDialogCreator* Browser::GetJavaScriptDialogCreator() { 4060 content::JavaScriptDialogCreator* Browser::GetJavaScriptDialogCreator() {
4060 return GetJavaScriptDialogCreatorInstance(); 4061 return GetJavaScriptDialogCreatorInstance();
4061 } 4062 }
4062 4063
4064 void Browser::OpenColorChooser(WebContents* tab,
4065 int color_chooser_id,
4066 const SkColor& color) {
4067 if (color_chooser_.get() &&
4068 color_chooser_id == color_chooser_->identifier() &&
4069 tab->GetRenderViewHost() == color_chooser_->render_view_host())
4070 return;
4071
4072 color_chooser_.reset(ColorChooser::Create(color_chooser_id,
4073 tab->GetRenderViewHost(),
4074 color));
4075 }
4076
4077 void Browser::EndColorChooser(WebContents* tab, int color_chooser_id) {
4078 if (!color_chooser_.get())
4079 return;
4080
4081 if (color_chooser_id != color_chooser_->identifier() ||
4082 tab->GetRenderViewHost() != color_chooser_->render_view_host())
4083 return;
4084
4085 color_chooser_->End();
4086 }
4087
4088 void Browser::SetSelectedColorInColorChooser(
4089 WebContents* tab, int color_chooser_id, const SkColor& color) {
4090 if (!color_chooser_.get())
4091 return;
4092
4093 if (color_chooser_id != color_chooser_->identifier() ||
4094 tab->GetRenderViewHost() != color_chooser_->render_view_host())
4095 return;
4096
4097 color_chooser_->SetSelectedColor(color);
4098 }
4099
4063 void Browser::RunFileChooser(WebContents* tab, 4100 void Browser::RunFileChooser(WebContents* tab,
4064 const content::FileChooserParams& params) { 4101 const content::FileChooserParams& params) {
4065 RunFileChooserHelper(tab, params); 4102 RunFileChooserHelper(tab, params);
4066 } 4103 }
4067 4104
4068 void Browser::EnumerateDirectory(WebContents* tab, int request_id, 4105 void Browser::EnumerateDirectory(WebContents* tab, int request_id,
4069 const FilePath& path) { 4106 const FilePath& path) {
4070 EnumerateDirectoryHelper(tab, request_id, path); 4107 EnumerateDirectoryHelper(tab, request_id, path);
4071 } 4108 }
4072 4109
(...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after
5543 params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE; 5580 params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
5544 ShowSingletonTabOverwritingNTP(params); 5581 ShowSingletonTabOverwritingNTP(params);
5545 } else { 5582 } else {
5546 service->ShowLoginDialog(); 5583 service->ShowLoginDialog();
5547 } 5584 }
5548 } 5585 }
5549 5586
5550 void Browser::ToggleSpeechInput() { 5587 void Browser::ToggleSpeechInput() {
5551 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); 5588 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
5552 } 5589 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698