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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 const content::NativeWebKeyboardEvent& event, | 160 const content::NativeWebKeyboardEvent& event, |
161 bool* is_keyboard_shortcut) OVERRIDE; | 161 bool* is_keyboard_shortcut) OVERRIDE; |
162 virtual void HandleKeyboardEvent( | 162 virtual void HandleKeyboardEvent( |
163 content::WebContents* source, | 163 content::WebContents* source, |
164 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 164 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
165 virtual void ResizeDueToAutoResize(content::WebContents* source, | 165 virtual void ResizeDueToAutoResize(content::WebContents* source, |
166 const gfx::Size& new_size) OVERRIDE; | 166 const gfx::Size& new_size) OVERRIDE; |
167 virtual content::JavaScriptDialogManager* | 167 virtual content::JavaScriptDialogManager* |
168 GetJavaScriptDialogManager() OVERRIDE; | 168 GetJavaScriptDialogManager() OVERRIDE; |
169 virtual content::ColorChooser* OpenColorChooser( | 169 virtual content::ColorChooser* OpenColorChooser( |
170 content::WebContents* web_contents, SkColor color) OVERRIDE; | 170 content::WebContents* web_contents, |
| 171 SkColor color, |
| 172 const std::vector<SkColor>& suggestions, |
| 173 const std::vector<string16>& suggestion_labels) OVERRIDE; |
171 virtual void RunFileChooser( | 174 virtual void RunFileChooser( |
172 content::WebContents* tab, | 175 content::WebContents* tab, |
173 const content::FileChooserParams& params) OVERRIDE; | 176 const content::FileChooserParams& params) OVERRIDE; |
174 virtual void AddNewContents(content::WebContents* source, | 177 virtual void AddNewContents(content::WebContents* source, |
175 content::WebContents* new_contents, | 178 content::WebContents* new_contents, |
176 WindowOpenDisposition disposition, | 179 WindowOpenDisposition disposition, |
177 const gfx::Rect& initial_pos, | 180 const gfx::Rect& initial_pos, |
178 bool user_gesture, | 181 bool user_gesture, |
179 bool* was_blocked) OVERRIDE; | 182 bool* was_blocked) OVERRIDE; |
180 virtual void CloseContents(content::WebContents* contents) OVERRIDE; | 183 virtual void CloseContents(content::WebContents* contents) OVERRIDE; |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 | 289 |
287 // Used to measure how long it's been since the host was created. | 290 // Used to measure how long it's been since the host was created. |
288 base::ElapsedTimer since_created_; | 291 base::ElapsedTimer since_created_; |
289 | 292 |
290 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); | 293 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); |
291 }; | 294 }; |
292 | 295 |
293 } // namespace extensions | 296 } // namespace extensions |
294 | 297 |
295 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ | 298 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ |
OLD | NEW |