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

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: 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 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 22 matching lines...) Expand all
33 #include "chrome/browser/ui/tabs/tab_strip_model.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model.h"
34 #include "chrome/browser/ui/webui/devtools_ui.h" 34 #include "chrome/browser/ui/webui/devtools_ui.h"
35 #include "chrome/common/chrome_notification_types.h" 35 #include "chrome/common/chrome_notification_types.h"
36 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
37 #include "chrome/common/extensions/manifest_url_handler.h" 37 #include "chrome/common/extensions/manifest_url_handler.h"
38 #include "chrome/common/pref_names.h" 38 #include "chrome/common/pref_names.h"
39 #include "chrome/common/render_messages.h" 39 #include "chrome/common/render_messages.h"
40 #include "chrome/common/url_constants.h" 40 #include "chrome/common/url_constants.h"
41 #include "components/user_prefs/pref_registry_syncable.h" 41 #include "components/user_prefs/pref_registry_syncable.h"
42 #include "content/public/browser/child_process_security_policy.h" 42 #include "content/public/browser/child_process_security_policy.h"
43 #include "content/public/browser/color_chooser.h"
43 #include "content/public/browser/devtools_agent_host.h" 44 #include "content/public/browser/devtools_agent_host.h"
44 #include "content/public/browser/devtools_client_host.h" 45 #include "content/public/browser/devtools_client_host.h"
45 #include "content/public/browser/devtools_manager.h" 46 #include "content/public/browser/devtools_manager.h"
46 #include "content/public/browser/favicon_status.h" 47 #include "content/public/browser/favicon_status.h"
47 #include "content/public/browser/load_notification_details.h" 48 #include "content/public/browser/load_notification_details.h"
48 #include "content/public/browser/navigation_controller.h" 49 #include "content/public/browser/navigation_controller.h"
49 #include "content/public/browser/navigation_entry.h" 50 #include "content/public/browser/navigation_entry.h"
50 #include "content/public/browser/notification_source.h" 51 #include "content/public/browser/notification_source.h"
51 #include "content/public/browser/render_process_host.h" 52 #include "content/public/browser/render_process_host.h"
52 #include "content/public/browser/render_view_host.h" 53 #include "content/public/browser/render_view_host.h"
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 1028
1028 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() { 1029 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
1029 content::WebContents* inspected_web_contents = GetInspectedWebContents(); 1030 content::WebContents* inspected_web_contents = GetInspectedWebContents();
1030 if (inspected_web_contents && inspected_web_contents->GetDelegate()) { 1031 if (inspected_web_contents && inspected_web_contents->GetDelegate()) {
1031 return inspected_web_contents->GetDelegate()-> 1032 return inspected_web_contents->GetDelegate()->
1032 GetJavaScriptDialogManager(); 1033 GetJavaScriptDialogManager();
1033 } 1034 }
1034 return content::WebContentsDelegate::GetJavaScriptDialogManager(); 1035 return content::WebContentsDelegate::GetJavaScriptDialogManager();
1035 } 1036 }
1036 1037
1038 content::ColorChooser* DevToolsWindow::OpenColorChooser(
1039 WebContents* web_contents, SkColor initial_color) {
1040 return content::ColorChooser::Open(web_contents, initial_color);
1041 }
1042
1037 void DevToolsWindow::RunFileChooser(WebContents* web_contents, 1043 void DevToolsWindow::RunFileChooser(WebContents* web_contents,
1038 const FileChooserParams& params) { 1044 const FileChooserParams& params) {
1039 FileSelectHelper::RunFileChooser(web_contents, params); 1045 FileSelectHelper::RunFileChooser(web_contents, params);
1040 } 1046 }
1041 1047
1042 void DevToolsWindow::WebContentsFocused(WebContents* contents) { 1048 void DevToolsWindow::WebContentsFocused(WebContents* contents) {
1043 Browser* inspected_browser = NULL; 1049 Browser* inspected_browser = NULL;
1044 int inspected_tab_index = -1; 1050 int inspected_tab_index = -1;
1045 1051
1046 if (IsDocked() && FindInspectedBrowserAndTabIndex(&inspected_browser, 1052 if (IsDocked() && FindInspectedBrowserAndTabIndex(&inspected_browser,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 DevToolsDockSide DevToolsWindow::SideFromString( 1106 DevToolsDockSide DevToolsWindow::SideFromString(
1101 const std::string& dock_side) { 1107 const std::string& dock_side) {
1102 if (dock_side == kDockSideRight) 1108 if (dock_side == kDockSideRight)
1103 return DEVTOOLS_DOCK_SIDE_RIGHT; 1109 return DEVTOOLS_DOCK_SIDE_RIGHT;
1104 if (dock_side == kDockSideBottom) 1110 if (dock_side == kDockSideBottom)
1105 return DEVTOOLS_DOCK_SIDE_BOTTOM; 1111 return DEVTOOLS_DOCK_SIDE_BOTTOM;
1106 if (dock_side == kDockSideMinimized) 1112 if (dock_side == kDockSideMinimized)
1107 return DEVTOOLS_DOCK_SIDE_MINIMIZED; 1113 return DEVTOOLS_DOCK_SIDE_MINIMIZED;
1108 return DEVTOOLS_DOCK_SIDE_UNDOCKED; 1114 return DEVTOOLS_DOCK_SIDE_UNDOCKED;
1109 } 1115 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698