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

Side by Side Diff: chrome/browser/devtools/devtools_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: Created 7 years, 9 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/prefs/scoped_user_pref_update.h" 21 #include "chrome/browser/prefs/scoped_user_pref_update.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/sessions/session_tab_helper.h" 23 #include "chrome/browser/sessions/session_tab_helper.h"
24 #include "chrome/browser/themes/theme_properties.h" 24 #include "chrome/browser/themes/theme_properties.h"
25 #include "chrome/browser/themes/theme_service.h" 25 #include "chrome/browser/themes/theme_service.h"
26 #include "chrome/browser/themes/theme_service_factory.h" 26 #include "chrome/browser/themes/theme_service_factory.h"
27 #include "chrome/browser/ui/browser.h" 27 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/browser_iterator.h" 28 #include "chrome/browser/ui/browser_iterator.h"
29 #include "chrome/browser/ui/browser_list.h" 29 #include "chrome/browser/ui/browser_list.h"
30 #include "chrome/browser/ui/browser_window.h" 30 #include "chrome/browser/ui/browser_window.h"
31 #include "chrome/browser/ui/color_chooser_controller.h"
31 #include "chrome/browser/ui/host_desktop.h" 32 #include "chrome/browser/ui/host_desktop.h"
32 #include "chrome/browser/ui/tabs/tab_strip_model.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model.h"
33 #include "chrome/common/chrome_notification_types.h" 34 #include "chrome/common/chrome_notification_types.h"
34 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/extensions/manifest_url_handler.h" 36 #include "chrome/common/extensions/manifest_url_handler.h"
36 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
37 #include "chrome/common/render_messages.h" 38 #include "chrome/common/render_messages.h"
38 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
39 #include "components/user_prefs/pref_registry_syncable.h" 40 #include "components/user_prefs/pref_registry_syncable.h"
40 #include "content/public/browser/child_process_security_policy.h" 41 #include "content/public/browser/child_process_security_policy.h"
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 972
972 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() { 973 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
973 content::WebContents* inspected_web_contents = GetInspectedWebContents(); 974 content::WebContents* inspected_web_contents = GetInspectedWebContents();
974 if (inspected_web_contents && inspected_web_contents->GetDelegate()) { 975 if (inspected_web_contents && inspected_web_contents->GetDelegate()) {
975 return inspected_web_contents->GetDelegate()-> 976 return inspected_web_contents->GetDelegate()->
976 GetJavaScriptDialogManager(); 977 GetJavaScriptDialogManager();
977 } 978 }
978 return content::WebContentsDelegate::GetJavaScriptDialogManager(); 979 return content::WebContentsDelegate::GetJavaScriptDialogManager();
979 } 980 }
980 981
982 content::ColorChooser* DevToolsWindow::OpenColorChooser(
983 WebContents* web_contents, int color_chooser_id, SkColor color) {
984 return ColorChooserController::GetInstance()->OpenColorChooser(
985 color, web_contents, color_chooser_id);
986 }
987
981 void DevToolsWindow::RunFileChooser(WebContents* web_contents, 988 void DevToolsWindow::RunFileChooser(WebContents* web_contents,
982 const FileChooserParams& params) { 989 const FileChooserParams& params) {
983 FileSelectHelper::RunFileChooser(web_contents, params); 990 FileSelectHelper::RunFileChooser(web_contents, params);
984 } 991 }
985 992
986 void DevToolsWindow::WebContentsFocused(WebContents* contents) { 993 void DevToolsWindow::WebContentsFocused(WebContents* contents) {
987 Browser* inspected_browser = NULL; 994 Browser* inspected_browser = NULL;
988 int inspected_tab_index = -1; 995 int inspected_tab_index = -1;
989 996
990 if (IsDocked() && FindInspectedBrowserAndTabIndex(&inspected_browser, 997 if (IsDocked() && FindInspectedBrowserAndTabIndex(&inspected_browser,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 1048
1042 // static 1049 // static
1043 DevToolsDockSide DevToolsWindow::SideFromString( 1050 DevToolsDockSide DevToolsWindow::SideFromString(
1044 const std::string& dock_side) { 1051 const std::string& dock_side) {
1045 if (dock_side == kDockSideRight) 1052 if (dock_side == kDockSideRight)
1046 return DEVTOOLS_DOCK_SIDE_RIGHT; 1053 return DEVTOOLS_DOCK_SIDE_RIGHT;
1047 if (dock_side == kDockSideBottom) 1054 if (dock_side == kDockSideBottom)
1048 return DEVTOOLS_DOCK_SIDE_BOTTOM; 1055 return DEVTOOLS_DOCK_SIDE_BOTTOM;
1049 return DEVTOOLS_DOCK_SIDE_UNDOCKED; 1056 return DEVTOOLS_DOCK_SIDE_UNDOCKED;
1050 } 1057 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698