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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 const content::NativeWebKeyboardEvent& event, | 165 const content::NativeWebKeyboardEvent& event, |
166 bool* is_keyboard_shortcut) OVERRIDE; | 166 bool* is_keyboard_shortcut) OVERRIDE; |
167 virtual void HandleKeyboardEvent( | 167 virtual void HandleKeyboardEvent( |
168 content::WebContents* source, | 168 content::WebContents* source, |
169 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 169 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
170 virtual void ResizeDueToAutoResize(content::WebContents* source, | 170 virtual void ResizeDueToAutoResize(content::WebContents* source, |
171 const gfx::Size& new_size) OVERRIDE; | 171 const gfx::Size& new_size) 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, SkColor color) OVERRIDE; | 175 content::WebContents* web_contents, |
| 176 SkColor color, |
| 177 const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; |
176 virtual void RunFileChooser( | 178 virtual void RunFileChooser( |
177 content::WebContents* tab, | 179 content::WebContents* tab, |
178 const content::FileChooserParams& params) OVERRIDE; | 180 const content::FileChooserParams& params) OVERRIDE; |
179 virtual void AddNewContents(content::WebContents* source, | 181 virtual void AddNewContents(content::WebContents* source, |
180 content::WebContents* new_contents, | 182 content::WebContents* new_contents, |
181 WindowOpenDisposition disposition, | 183 WindowOpenDisposition disposition, |
182 const gfx::Rect& initial_pos, | 184 const gfx::Rect& initial_pos, |
183 bool user_gesture, | 185 bool user_gesture, |
184 bool* was_blocked) OVERRIDE; | 186 bool* was_blocked) OVERRIDE; |
185 virtual void CloseContents(content::WebContents* contents) OVERRIDE; | 187 virtual void CloseContents(content::WebContents* contents) OVERRIDE; |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 | 293 |
292 // Used to measure how long it's been since the host was created. | 294 // Used to measure how long it's been since the host was created. |
293 base::ElapsedTimer since_created_; | 295 base::ElapsedTimer since_created_; |
294 | 296 |
295 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); | 297 DISALLOW_COPY_AND_ASSIGN(ExtensionHost); |
296 }; | 298 }; |
297 | 299 |
298 } // namespace extensions | 300 } // namespace extensions |
299 | 301 |
300 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ | 302 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_ |
OLD | NEW |