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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 content::WebContents* source, | 168 content::WebContents* source, |
169 const content::NativeWebKeyboardEvent& event, | 169 const content::NativeWebKeyboardEvent& event, |
170 bool* is_keyboard_shortcut) OVERRIDE; | 170 bool* is_keyboard_shortcut) OVERRIDE; |
171 virtual void HandleKeyboardEvent( | 171 virtual void HandleKeyboardEvent( |
172 content::WebContents* source, | 172 content::WebContents* source, |
173 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 173 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
174 virtual content::JavaScriptDialogManager* | 174 virtual content::JavaScriptDialogManager* |
175 GetJavaScriptDialogManager() OVERRIDE; | 175 GetJavaScriptDialogManager() OVERRIDE; |
176 virtual content::ColorChooser* OpenColorChooser( | 176 virtual content::ColorChooser* OpenColorChooser( |
177 content::WebContents* web_contents, | 177 content::WebContents* web_contents, |
178 SkColor color) OVERRIDE; | 178 SkColor color, |
| 179 const std::vector<SkColor>& suggestions, |
| 180 const std::vector<string16>& suggestion_labels) OVERRIDE; |
179 virtual void RunFileChooser( | 181 virtual void RunFileChooser( |
180 content::WebContents* web_contents, | 182 content::WebContents* web_contents, |
181 const content::FileChooserParams& params) OVERRIDE; | 183 const content::FileChooserParams& params) OVERRIDE; |
182 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; | 184 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; |
183 | 185 |
184 // content::DevToolsFrontendHostDelegate: | 186 // content::DevToolsFrontendHostDelegate: |
185 virtual void ActivateWindow() OVERRIDE; | 187 virtual void ActivateWindow() OVERRIDE; |
186 virtual void ChangeAttachedWindowHeight(unsigned height) OVERRIDE; | 188 virtual void ChangeAttachedWindowHeight(unsigned height) OVERRIDE; |
187 virtual void CloseWindow() OVERRIDE; | 189 virtual void CloseWindow() OVERRIDE; |
188 virtual void MoveWindow(int x, int y) OVERRIDE; | 190 virtual void MoveWindow(int x, int y) OVERRIDE; |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 IndexingJobsMap; | 265 IndexingJobsMap; |
264 IndexingJobsMap indexing_jobs_; | 266 IndexingJobsMap indexing_jobs_; |
265 int width_; | 267 int width_; |
266 int height_; | 268 int height_; |
267 DevToolsDockSide dock_side_before_minimized_; | 269 DevToolsDockSide dock_side_before_minimized_; |
268 | 270 |
269 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); | 271 DISALLOW_COPY_AND_ASSIGN(DevToolsWindow); |
270 }; | 272 }; |
271 | 273 |
272 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ | 274 #endif // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_ |
OLD | NEW |