OLD | NEW |
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_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 5 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
6 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 6 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 content::WebContents* source, | 178 content::WebContents* source, |
179 const content::NativeWebKeyboardEvent& event, | 179 const content::NativeWebKeyboardEvent& event, |
180 bool* is_keyboard_shortcut) OVERRIDE; | 180 bool* is_keyboard_shortcut) OVERRIDE; |
181 virtual void HandleKeyboardEvent( | 181 virtual void HandleKeyboardEvent( |
182 content::WebContents* source, | 182 content::WebContents* source, |
183 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 183 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
184 virtual content::JavaScriptDialogManager* | 184 virtual content::JavaScriptDialogManager* |
185 GetJavaScriptDialogManager() OVERRIDE; | 185 GetJavaScriptDialogManager() OVERRIDE; |
186 virtual content::ColorChooser* OpenColorChooser( | 186 virtual content::ColorChooser* OpenColorChooser( |
187 content::WebContents* web_contents, | 187 content::WebContents* web_contents, |
188 SkColor color) OVERRIDE; | 188 SkColor color, |
| 189 const std::vector<SkColor>& suggestions, |
| 190 const std::vector<string16>& suggestion_labels) OVERRIDE; |
189 virtual void RunFileChooser( | 191 virtual void RunFileChooser( |
190 content::WebContents* web_contents, | 192 content::WebContents* web_contents, |
191 const content::FileChooserParams& params) OVERRIDE; | 193 const content::FileChooserParams& params) OVERRIDE; |
192 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 194 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; |
193 | 195 |
194 // content::DevToolsFrontendHostDelegate override: | 196 // content::DevToolsFrontendHostDelegate override: |
195 virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE; | 197 virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE; |
196 | 198 |
197 // DevToolsEmbedderMessageDispatcher::Delegate overrides: | 199 // DevToolsEmbedderMessageDispatcher::Delegate overrides: |
198 virtual void ActivateWindow() OVERRIDE; | 200 virtual void ActivateWindow() OVERRIDE; |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 int width_; | 283 int width_; |
282 int height_; | 284 int height_; |
283 DevToolsDockSide dock_side_before_minimized_; | 285 DevToolsDockSide dock_side_before_minimized_; |
284 | 286 |
285 scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_; | 287 scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_; |
286 base::WeakPtrFactory<DevToolsWindow> weak_factory_; | 288 base::WeakPtrFactory<DevToolsWindow> weak_factory_; |
287 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); | 289 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); |
288 }; | 290 }; |
289 | 291 |
290 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 292 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
OLD | NEW |