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

Side by Side Diff: chrome/browser/debugger/devtools_window.h

Issue 10693064: Make file chooser work when DevTools window is docked to the inspected tab (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | « no previous file | chrome/browser/debugger/devtools_window.cc » ('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 #ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 5 #ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
6 #define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 6 #define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 18 matching lines...) Expand all
29 class Profile; 29 class Profile;
30 class TabContents; 30 class TabContents;
31 31
32 namespace base { 32 namespace base {
33 class Value; 33 class Value;
34 } 34 }
35 35
36 namespace content { 36 namespace content {
37 class DevToolsAgentHost; 37 class DevToolsAgentHost;
38 class DevToolsClientHost; 38 class DevToolsClientHost;
39 struct FileChooserParams;
39 class RenderViewHost; 40 class RenderViewHost;
40 class WebContents; 41 class WebContents;
41 } 42 }
42 43
43 class DevToolsWindow : private content::NotificationObserver, 44 class DevToolsWindow : private content::NotificationObserver,
44 private content::WebContentsDelegate, 45 private content::WebContentsDelegate,
45 private content::DevToolsFrontendHostDelegate, 46 private content::DevToolsFrontendHostDelegate,
46 private DevToolsFileHelper::Delegate { 47 private DevToolsFileHelper::Delegate {
47 public: 48 public:
48 static const char kDevToolsApp[]; 49 static const char kDevToolsApp[];
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 const gfx::Rect& initial_pos, 115 const gfx::Rect& initial_pos,
115 bool user_gesture) OVERRIDE; 116 bool user_gesture) OVERRIDE;
116 virtual void CloseContents(content::WebContents* source) OVERRIDE {} 117 virtual void CloseContents(content::WebContents* source) OVERRIDE {}
117 virtual bool PreHandleKeyboardEvent( 118 virtual bool PreHandleKeyboardEvent(
118 const content::NativeWebKeyboardEvent& event, 119 const content::NativeWebKeyboardEvent& event,
119 bool* is_keyboard_shortcut) OVERRIDE; 120 bool* is_keyboard_shortcut) OVERRIDE;
120 virtual void HandleKeyboardEvent( 121 virtual void HandleKeyboardEvent(
121 const content::NativeWebKeyboardEvent& event) OVERRIDE; 122 const content::NativeWebKeyboardEvent& event) OVERRIDE;
122 virtual content::JavaScriptDialogCreator* 123 virtual content::JavaScriptDialogCreator*
123 GetJavaScriptDialogCreator() OVERRIDE; 124 GetJavaScriptDialogCreator() OVERRIDE;
125 virtual void RunFileChooser(
126 content::WebContents* web_contents,
127 const content::FileChooserParams& params) OVERRIDE;
124 128
125 virtual void FrameNavigating(const std::string& url) OVERRIDE {} 129 virtual void FrameNavigating(const std::string& url) OVERRIDE {}
126 130
127 static DevToolsWindow* ToggleDevToolsWindow( 131 static DevToolsWindow* ToggleDevToolsWindow(
128 content::RenderViewHost* inspected_rvh, 132 content::RenderViewHost* inspected_rvh,
129 bool force_open, 133 bool force_open,
130 DevToolsToggleAction action); 134 DevToolsToggleAction action);
131 static DevToolsWindow* AsDevToolsWindow(content::DevToolsClientHost*); 135 static DevToolsWindow* AsDevToolsWindow(content::DevToolsClientHost*);
132 136
133 // content::DevToolsClientHandlerDelegate overrides. 137 // content::DevToolsClientHandlerDelegate overrides.
(...skipping 23 matching lines...) Expand all
157 bool docked_; 161 bool docked_;
158 bool is_loaded_; 162 bool is_loaded_;
159 DevToolsToggleAction action_on_load_; 163 DevToolsToggleAction action_on_load_;
160 content::NotificationRegistrar registrar_; 164 content::NotificationRegistrar registrar_;
161 content::DevToolsClientHost* frontend_host_; 165 content::DevToolsClientHost* frontend_host_;
162 scoped_ptr<DevToolsFileHelper> file_helper_; 166 scoped_ptr<DevToolsFileHelper> file_helper_;
163 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); 167 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
164 }; 168 };
165 169
166 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_ 170 #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/debugger/devtools_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698