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

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

Issue 12082123: Rename JavaScriptDialogCreator to JavaScriptDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/extensions/extension_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 DictionaryValue* file_system_value = NULL; 906 DictionaryValue* file_system_value = NULL;
907 if (!file_system.file_system_path.empty()) 907 if (!file_system.file_system_path.empty())
908 file_system_value = CreateFileSystemValue(file_system); 908 file_system_value = CreateFileSystemValue(file_system);
909 CallClientFunction("InspectorFrontendAPI.fileSystemAdded", 909 CallClientFunction("InspectorFrontendAPI.fileSystemAdded",
910 &error_string_value, 910 &error_string_value,
911 file_system_value); 911 file_system_value);
912 if (file_system_value) 912 if (file_system_value)
913 delete file_system_value; 913 delete file_system_value;
914 } 914 }
915 915
916 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { 916 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
917 if (inspected_web_contents_ && inspected_web_contents_->GetDelegate()) { 917 if (inspected_web_contents_ && inspected_web_contents_->GetDelegate()) {
918 return inspected_web_contents_->GetDelegate()-> 918 return inspected_web_contents_->GetDelegate()->
919 GetJavaScriptDialogCreator(); 919 GetJavaScriptDialogManager();
920 } 920 }
921 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); 921 return content::WebContentsDelegate::GetJavaScriptDialogManager();
922 } 922 }
923 923
924 void DevToolsWindow::RunFileChooser(WebContents* web_contents, 924 void DevToolsWindow::RunFileChooser(WebContents* web_contents,
925 const FileChooserParams& params) { 925 const FileChooserParams& params) {
926 FileSelectHelper::RunFileChooser(web_contents, params); 926 FileSelectHelper::RunFileChooser(web_contents, params);
927 } 927 }
928 928
929 void DevToolsWindow::WebContentsFocused(WebContents* contents) { 929 void DevToolsWindow::WebContentsFocused(WebContents* contents) {
930 Browser* inspected_browser = NULL; 930 Browser* inspected_browser = NULL;
931 int inspected_tab_index = -1; 931 int inspected_tab_index = -1;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 983
984 // static 984 // static
985 DevToolsDockSide DevToolsWindow::SideFromString( 985 DevToolsDockSide DevToolsWindow::SideFromString(
986 const std::string& dock_side) { 986 const std::string& dock_side) {
987 if (dock_side == kDockSideRight) 987 if (dock_side == kDockSideRight)
988 return DEVTOOLS_DOCK_SIDE_RIGHT; 988 return DEVTOOLS_DOCK_SIDE_RIGHT;
989 if (dock_side == kDockSideBottom) 989 if (dock_side == kDockSideBottom)
990 return DEVTOOLS_DOCK_SIDE_BOTTOM; 990 return DEVTOOLS_DOCK_SIDE_BOTTOM;
991 return DEVTOOLS_DOCK_SIDE_UNDOCKED; 991 return DEVTOOLS_DOCK_SIDE_UNDOCKED;
992 } 992 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_window.h ('k') | chrome/browser/extensions/extension_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698