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

Side by Side Diff: chrome/browser/devtools/devtools_window.cc

Issue 23026006: Add support for color input datalist on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
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 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 798
799 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() { 799 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
800 content::WebContents* inspected_web_contents = GetInspectedWebContents(); 800 content::WebContents* inspected_web_contents = GetInspectedWebContents();
801 return (inspected_web_contents && inspected_web_contents->GetDelegate()) ? 801 return (inspected_web_contents && inspected_web_contents->GetDelegate()) ?
802 inspected_web_contents->GetDelegate()->GetJavaScriptDialogManager() : 802 inspected_web_contents->GetDelegate()->GetJavaScriptDialogManager() :
803 content::WebContentsDelegate::GetJavaScriptDialogManager(); 803 content::WebContentsDelegate::GetJavaScriptDialogManager();
804 } 804 }
805 805
806 content::ColorChooser* DevToolsWindow::OpenColorChooser( 806 content::ColorChooser* DevToolsWindow::OpenColorChooser(
807 content::WebContents* web_contents, 807 content::WebContents* web_contents,
808 SkColor initial_color) { 808 SkColor initial_color,
809 const std::vector<SkColor>& suggestions,
810 const std::vector<string16>& suggestion_labels) {
809 return chrome::ShowColorChooser(web_contents, initial_color); 811 return chrome::ShowColorChooser(web_contents, initial_color);
810 } 812 }
811 813
812 void DevToolsWindow::RunFileChooser(content::WebContents* web_contents, 814 void DevToolsWindow::RunFileChooser(content::WebContents* web_contents,
813 const content::FileChooserParams& params) { 815 const content::FileChooserParams& params) {
814 FileSelectHelper::RunFileChooser(web_contents, params); 816 FileSelectHelper::RunFileChooser(web_contents, params);
815 } 817 }
816 818
817 void DevToolsWindow::WebContentsFocused(content::WebContents* contents) { 819 void DevToolsWindow::WebContentsFocused(content::WebContents* contents) {
818 Browser* inspected_browser = NULL; 820 Browser* inspected_browser = NULL;
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 1320
1319 void DevToolsWindow::Restore() { 1321 void DevToolsWindow::Restore() {
1320 if (dock_side_ == DEVTOOLS_DOCK_SIDE_MINIMIZED) 1322 if (dock_side_ == DEVTOOLS_DOCK_SIDE_MINIMIZED)
1321 SetDockSide(SideToString(dock_side_before_minimized_)); 1323 SetDockSide(SideToString(dock_side_before_minimized_));
1322 } 1324 }
1323 1325
1324 content::WebContents* DevToolsWindow::GetInspectedWebContents() { 1326 content::WebContents* DevToolsWindow::GetInspectedWebContents() {
1325 return inspected_contents_observer_ ? 1327 return inspected_contents_observer_ ?
1326 inspected_contents_observer_->web_contents() : NULL; 1328 inspected_contents_observer_->web_contents() : NULL;
1327 } 1329 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698