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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 const content::NativeWebKeyboardEvent& event, | 157 const content::NativeWebKeyboardEvent& event, |
158 bool* is_keyboard_shortcut) OVERRIDE; | 158 bool* is_keyboard_shortcut) OVERRIDE; |
159 virtual void HandleKeyboardEvent( | 159 virtual void HandleKeyboardEvent( |
160 content::WebContents* source, | 160 content::WebContents* source, |
161 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 161 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
162 virtual void ResizeDueToAutoResize(content::WebContents* source, | 162 virtual void ResizeDueToAutoResize(content::WebContents* source, |
163 const gfx::Size& new_size) OVERRIDE; | 163 const gfx::Size& new_size) OVERRIDE; |
164 virtual content::JavaScriptDialogManager* | 164 virtual content::JavaScriptDialogManager* |
165 GetJavaScriptDialogManager() OVERRIDE; | 165 GetJavaScriptDialogManager() OVERRIDE; |
166 virtual content::ColorChooser* OpenColorChooser( | 166 virtual content::ColorChooser* OpenColorChooser( |
167 content::WebContents* web_contents, SkColor color) OVERRIDE; | 167 content::WebContents* web_contents, |
| 168 SkColor color, |
| 169 const std::vector<SkColor>& suggestions, |
| 170 const std::vector<string16>& suggestion_labels) OVERRIDE; |
168 virtual void RunFileChooser( | 171 virtual void RunFileChooser( |
169 content::WebContents* tab, | 172 content::WebContents* tab, |
170 const content::FileChooserParams& params) OVERRIDE; | 173 const content::FileChooserParams& params) OVERRIDE; |
171 virtual void AddNewContents(content::WebContents* source, | 174 virtual void AddNewContents(content::WebContents* source, |
172 content::WebContents* new_contents, | 175 content::WebContents* new_contents, |
173 WindowOpenDisposition disposition, | 176 WindowOpenDisposition disposition, |
174 const gfx::Rect& initial_pos, | 177 const gfx::Rect& initial_pos, |
175 bool user_gesture, | 178 bool user_gesture, |
176 bool* was_blocked) OVERRIDE; | 179 bool* was_blocked) OVERRIDE; |
177 virtual void CloseContents(content::WebContents* contents) OVERRIDE; | 180 virtual void CloseContents(content::WebContents* contents) OVERRIDE; |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 | 266 |
264 // Used to measure how long it's been since the host was created. | 267 // Used to measure how long it's been since the host was created. |
265 PerfTimer since_created_; | 268 PerfTimer since_created_; |
266 | 269 |
267 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); | 270 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); |
268 }; | 271 }; |
269 | 272 |
270 } // namespace extensions | 273 } // namespace extensions |
271 | 274 |
272 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ | 275 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ |
OLD | NEW |