| 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_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
| 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 // TODO(victorhsieh): move to ChromeContentBrowserClient once we migrate | 133 // TODO(victorhsieh): move to ChromeContentBrowserClient once we migrate |
| 134 // PPAPI FileIO host to browser. | 134 // PPAPI FileIO host to browser. |
| 135 virtual bool IsPluginAllowedToCallRequestOSFileHandle( | 135 virtual bool IsPluginAllowedToCallRequestOSFileHandle( |
| 136 WebKit::WebPluginContainer* container) OVERRIDE; | 136 WebKit::WebPluginContainer* container) OVERRIDE; |
| 137 virtual WebKit::WebSpeechSynthesizer* OverrideSpeechSynthesizer( | 137 virtual WebKit::WebSpeechSynthesizer* OverrideSpeechSynthesizer( |
| 138 WebKit::WebSpeechSynthesizerClient* client) OVERRIDE; | 138 WebKit::WebSpeechSynthesizerClient* client) OVERRIDE; |
| 139 virtual bool ShouldReportDetailedMessageForSource( | 139 virtual bool ShouldReportDetailedMessageForSource( |
| 140 const base::string16& source) const OVERRIDE; | 140 const base::string16& source) const OVERRIDE; |
| 141 virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE; | 141 virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE; |
| 142 virtual bool AllowPepperMediaStreamAPI(const GURL& url) OVERRIDE; | 142 virtual bool AllowPepperMediaStreamAPI(const GURL& url) OVERRIDE; |
| 143 virtual void AddKeySystems( | |
| 144 std::vector<content::KeySystemInfo>* key_systems) OVERRIDE; | |
| 145 | 143 |
| 146 // For testing. | 144 // For testing. |
| 147 void SetExtensionDispatcher(extensions::Dispatcher* extension_dispatcher); | 145 void SetExtensionDispatcher(extensions::Dispatcher* extension_dispatcher); |
| 148 | 146 |
| 149 #if defined(ENABLE_SPELLCHECK) | 147 #if defined(ENABLE_SPELLCHECK) |
| 150 // Sets a new |spellcheck|. Used for low-mem restart and testing only. | 148 // Sets a new |spellcheck|. Used for low-mem restart and testing only. |
| 151 // Takes ownership of |spellcheck|. | 149 // Takes ownership of |spellcheck|. |
| 152 void SetSpellcheck(SpellCheck* spellcheck); | 150 void SetSpellcheck(SpellCheck* spellcheck); |
| 153 #endif | 151 #endif |
| 154 | 152 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 #endif | 207 #endif |
| 210 | 208 |
| 211 #if defined(ENABLE_PLUGINS) | 209 #if defined(ENABLE_PLUGINS) |
| 212 std::set<std::string> allowed_file_handle_origins_; | 210 std::set<std::string> allowed_file_handle_origins_; |
| 213 #endif | 211 #endif |
| 214 }; | 212 }; |
| 215 | 213 |
| 216 } // namespace chrome | 214 } // namespace chrome |
| 217 | 215 |
| 218 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 216 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
| OLD | NEW |