| 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 CONTENT_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_ |
| 6 #define CONTENT_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_ | 6 #define CONTENT_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "content/public/renderer/content_renderer_client.h" | 10 #include "content/public/renderer/content_renderer_client.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 // ContentRendererClient implementation. | 23 // ContentRendererClient implementation. |
| 24 void RenderThreadStarted() override; | 24 void RenderThreadStarted() override; |
| 25 void RenderViewCreated(RenderView* render_view) override; | 25 void RenderViewCreated(RenderView* render_view) override; |
| 26 | 26 |
| 27 // TODO(mkwst): These toggle based on the kEnablePepperTesting flag. Do we | 27 // TODO(mkwst): These toggle based on the kEnablePepperTesting flag. Do we |
| 28 // need that outside of layout tests? | 28 // need that outside of layout tests? |
| 29 bool IsPluginAllowedToUseCompositorAPI(const GURL& url) override; | 29 bool IsPluginAllowedToUseCompositorAPI(const GURL& url) override; |
| 30 bool IsPluginAllowedToUseDevChannelAPIs() override; | 30 bool IsPluginAllowedToUseDevChannelAPIs() override; |
| 31 | 31 |
| 32 base::StringPiece GetOriginTrialPublicKey() override; |
| 33 |
| 32 private: | 34 private: |
| 33 scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_; | 35 scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_; |
| 36 base::StringPiece origin_trial_public_key_; |
| 34 }; | 37 }; |
| 35 | 38 |
| 36 } // namespace content | 39 } // namespace content |
| 37 | 40 |
| 38 #endif // CONTENT_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_ | 41 #endif // CONTENT_SHELL_RENDERER_SHELL_CONTENT_RENDERER_CLIENT_H_ |
| OLD | NEW |