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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 content::WebContents* source, | 170 content::WebContents* source, |
171 const content::NativeWebKeyboardEvent& event, | 171 const content::NativeWebKeyboardEvent& event, |
172 bool* is_keyboard_shortcut) OVERRIDE; | 172 bool* is_keyboard_shortcut) OVERRIDE; |
173 virtual void HandleKeyboardEvent( | 173 virtual void HandleKeyboardEvent( |
174 content::WebContents* source, | 174 content::WebContents* source, |
175 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 175 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
176 virtual content::JavaScriptDialogManager* | 176 virtual content::JavaScriptDialogManager* |
177 GetJavaScriptDialogManager() OVERRIDE; | 177 GetJavaScriptDialogManager() OVERRIDE; |
178 virtual content::ColorChooser* OpenColorChooser( | 178 virtual content::ColorChooser* OpenColorChooser( |
179 content::WebContents* web_contents, | 179 content::WebContents* web_contents, |
180 SkColor color) OVERRIDE; | 180 SkColor color, |
| 181 const std::vector<SkColor>& suggestions, |
| 182 const std::vector<string16>& suggestion_labels) OVERRIDE; |
181 virtual void RunFileChooser( | 183 virtual void RunFileChooser( |
182 content::WebContents* web_contents, | 184 content::WebContents* web_contents, |
183 const content::FileChooserParams& params) OVERRIDE; | 185 const content::FileChooserParams& params) OVERRIDE; |
184 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 186 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; |
185 | 187 |
186 // content::DevToolsFrontendHostDelegate override: | 188 // content::DevToolsFrontendHostDelegate override: |
187 virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE; | 189 virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE; |
188 | 190 |
189 // DevToolsEmbedderMessageDispatcher::Delegate overrides: | 191 // DevToolsEmbedderMessageDispatcher::Delegate overrides: |
190 virtual void ActivateWindow() OVERRIDE; | 192 virtual void ActivateWindow() OVERRIDE; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 IndexingJobsMap indexing_jobs_; | 270 IndexingJobsMap indexing_jobs_; |
269 int width_; | 271 int width_; |
270 int height_; | 272 int height_; |
271 DevToolsDockSide dock_side_before_minimized_; | 273 DevToolsDockSide dock_side_before_minimized_; |
272 | 274 |
273 scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_; | 275 scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_; |
274 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); | 276 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); |
275 }; | 277 }; |
276 | 278 |
277 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 279 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
OLD | NEW |