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_EXTENSIONS_EXTENSION_HOST_H_ | 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ |
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ | 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 const content::NativeWebKeyboardEvent& event, | 159 const content::NativeWebKeyboardEvent& event, |
160 bool* is_keyboard_shortcut) OVERRIDE; | 160 bool* is_keyboard_shortcut) OVERRIDE; |
161 virtual void HandleKeyboardEvent( | 161 virtual void HandleKeyboardEvent( |
162 content::WebContents* source, | 162 content::WebContents* source, |
163 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 163 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
164 virtual void ResizeDueToAutoResize(content::WebContents* source, | 164 virtual void ResizeDueToAutoResize(content::WebContents* source, |
165 const gfx::Size& new_size) OVERRIDE; | 165 const gfx::Size& new_size) OVERRIDE; |
166 virtual content::JavaScriptDialogManager* | 166 virtual content::JavaScriptDialogManager* |
167 GetJavaScriptDialogManager() OVERRIDE; | 167 GetJavaScriptDialogManager() OVERRIDE; |
168 virtual content::ColorChooser* OpenColorChooser( | 168 virtual content::ColorChooser* OpenColorChooser( |
169 content::WebContents* web_contents, SkColor color) OVERRIDE; | 169 content::WebContents* web_contents, |
| 170 SkColor color, |
| 171 const std::vector<SkColor>& suggestions, |
| 172 const std::vector<string16>& suggestion_labels) OVERRIDE; |
170 virtual void RunFileChooser( | 173 virtual void RunFileChooser( |
171 content::WebContents* tab, | 174 content::WebContents* tab, |
172 const content::FileChooserParams& params) OVERRIDE; | 175 const content::FileChooserParams& params) OVERRIDE; |
173 virtual void AddNewContents(content::WebContents* source, | 176 virtual void AddNewContents(content::WebContents* source, |
174 content::WebContents* new_contents, | 177 content::WebContents* new_contents, |
175 WindowOpenDisposition disposition, | 178 WindowOpenDisposition disposition, |
176 const gfx::Rect& initial_pos, | 179 const gfx::Rect& initial_pos, |
177 bool user_gesture, | 180 bool user_gesture, |
178 bool* was_blocked) OVERRIDE; | 181 bool* was_blocked) OVERRIDE; |
179 virtual void CloseContents(content::WebContents* contents) OVERRIDE; | 182 virtual void CloseContents(content::WebContents* contents) OVERRIDE; |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 | 282 |
280 // Used to measure how long it's been since the host was created. | 283 // Used to measure how long it's been since the host was created. |
281 PerfTimer since_created_; | 284 PerfTimer since_created_; |
282 | 285 |
283 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); | 286 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); |
284 }; | 287 }; |
285 | 288 |
286 } // namespace extensions | 289 } // namespace extensions |
287 | 290 |
288 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ | 291 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ |
OLD | NEW |