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

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: Rebased Created 7 years, 7 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/devtools/devtools_window.h" 5 #include "chrome/browser/devtools/devtools_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/prefs/scoped_user_pref_update.h" 23 #include "chrome/browser/prefs/scoped_user_pref_update.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/sessions/session_tab_helper.h" 25 #include "chrome/browser/sessions/session_tab_helper.h"
26 #include "chrome/browser/themes/theme_properties.h" 26 #include "chrome/browser/themes/theme_properties.h"
27 #include "chrome/browser/themes/theme_service.h" 27 #include "chrome/browser/themes/theme_service.h"
28 #include "chrome/browser/themes/theme_service_factory.h" 28 #include "chrome/browser/themes/theme_service_factory.h"
29 #include "chrome/browser/ui/browser.h" 29 #include "chrome/browser/ui/browser.h"
30 #include "chrome/browser/ui/browser_iterator.h" 30 #include "chrome/browser/ui/browser_iterator.h"
31 #include "chrome/browser/ui/browser_list.h" 31 #include "chrome/browser/ui/browser_list.h"
32 #include "chrome/browser/ui/browser_window.h" 32 #include "chrome/browser/ui/browser_window.h"
33 #include "chrome/browser/ui/color_chooser_util.h"
33 #include "chrome/browser/ui/host_desktop.h" 34 #include "chrome/browser/ui/host_desktop.h"
34 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 35 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
35 #include "chrome/browser/ui/tabs/tab_strip_model.h" 36 #include "chrome/browser/ui/tabs/tab_strip_model.h"
36 #include "chrome/browser/ui/webui/devtools_ui.h" 37 #include "chrome/browser/ui/webui/devtools_ui.h"
37 #include "chrome/common/chrome_notification_types.h" 38 #include "chrome/common/chrome_notification_types.h"
38 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
39 #include "chrome/common/extensions/manifest_url_handler.h" 40 #include "chrome/common/extensions/manifest_url_handler.h"
40 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
41 #include "chrome/common/render_messages.h" 42 #include "chrome/common/render_messages.h"
42 #include "chrome/common/url_constants.h" 43 #include "chrome/common/url_constants.h"
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 1094
1094 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() { 1095 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
1095 content::WebContents* inspected_web_contents = GetInspectedWebContents(); 1096 content::WebContents* inspected_web_contents = GetInspectedWebContents();
1096 if (inspected_web_contents && inspected_web_contents->GetDelegate()) { 1097 if (inspected_web_contents && inspected_web_contents->GetDelegate()) {
1097 return inspected_web_contents->GetDelegate()-> 1098 return inspected_web_contents->GetDelegate()->
1098 GetJavaScriptDialogManager(); 1099 GetJavaScriptDialogManager();
1099 } 1100 }
1100 return content::WebContentsDelegate::GetJavaScriptDialogManager(); 1101 return content::WebContentsDelegate::GetJavaScriptDialogManager();
1101 } 1102 }
1102 1103
1104 content::ColorChooser* DevToolsWindow::OpenColorChooser(
1105 WebContents* web_contents, SkColor initial_color) {
1106 return ::OpenColorChooser(web_contents, initial_color);
1107 }
1108
1103 void DevToolsWindow::RunFileChooser(WebContents* web_contents, 1109 void DevToolsWindow::RunFileChooser(WebContents* web_contents,
1104 const FileChooserParams& params) { 1110 const FileChooserParams& params) {
1105 FileSelectHelper::RunFileChooser(web_contents, params); 1111 FileSelectHelper::RunFileChooser(web_contents, params);
1106 } 1112 }
1107 1113
1108 void DevToolsWindow::WebContentsFocused(WebContents* contents) { 1114 void DevToolsWindow::WebContentsFocused(WebContents* contents) {
1109 Browser* inspected_browser = NULL; 1115 Browser* inspected_browser = NULL;
1110 int inspected_tab_index = -1; 1116 int inspected_tab_index = -1;
1111 1117
1112 if (IsDocked() && FindInspectedBrowserAndTabIndex(&inspected_browser, 1118 if (IsDocked() && FindInspectedBrowserAndTabIndex(&inspected_browser,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 DevToolsDockSide DevToolsWindow::SideFromString( 1172 DevToolsDockSide DevToolsWindow::SideFromString(
1167 const std::string& dock_side) { 1173 const std::string& dock_side) {
1168 if (dock_side == kDockSideRight) 1174 if (dock_side == kDockSideRight)
1169 return DEVTOOLS_DOCK_SIDE_RIGHT; 1175 return DEVTOOLS_DOCK_SIDE_RIGHT;
1170 if (dock_side == kDockSideBottom) 1176 if (dock_side == kDockSideBottom)
1171 return DEVTOOLS_DOCK_SIDE_BOTTOM; 1177 return DEVTOOLS_DOCK_SIDE_BOTTOM;
1172 if (dock_side == kDockSideMinimized) 1178 if (dock_side == kDockSideMinimized)
1173 return DEVTOOLS_DOCK_SIDE_MINIMIZED; 1179 return DEVTOOLS_DOCK_SIDE_MINIMIZED;
1174 return DEVTOOLS_DOCK_SIDE_UNDOCKED; 1180 return DEVTOOLS_DOCK_SIDE_UNDOCKED;
1175 } 1181 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698