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