| OLD | NEW | 
|    1 // Copyright 2014 The Chromium Authors. All rights reserved. |    1 // Copyright 2014 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 #include "extensions/shell/renderer/shell_content_renderer_client.h" |    5 #include "extensions/shell/renderer/shell_content_renderer_client.h" | 
|    6  |    6  | 
|    7 #include "content/public/common/content_constants.h" |    7 #include "content/public/common/content_constants.h" | 
|    8 #include "content/public/renderer/render_frame.h" |    8 #include "content/public/renderer/render_frame.h" | 
|    9 #include "content/public/renderer/render_frame_observer.h" |    9 #include "content/public/renderer/render_frame_observer.h" | 
|   10 #include "content/public/renderer/render_frame_observer_tracker.h" |   10 #include "content/public/renderer/render_frame_observer_tracker.h" | 
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   90     content::RenderFrame* render_frame, |   90     content::RenderFrame* render_frame, | 
|   91     const base::FilePath& plugin_path) { |   91     const base::FilePath& plugin_path) { | 
|   92   // Don't provide a custom "failed to load" plugin. |   92   // Don't provide a custom "failed to load" plugin. | 
|   93   return NULL; |   93   return NULL; | 
|   94 } |   94 } | 
|   95  |   95  | 
|   96 bool ShellContentRendererClient::WillSendRequest( |   96 bool ShellContentRendererClient::WillSendRequest( | 
|   97     blink::WebLocalFrame* frame, |   97     blink::WebLocalFrame* frame, | 
|   98     ui::PageTransition transition_type, |   98     ui::PageTransition transition_type, | 
|   99     const blink::WebURL& url, |   99     const blink::WebURL& url, | 
 |  100     std::vector<std::unique_ptr<content::URLLoaderThrottle>>* throttles, | 
|  100     GURL* new_url) { |  101     GURL* new_url) { | 
|  101   // TODO(jamescook): Cause an error for bad extension scheme requests? |  102   // TODO(jamescook): Cause an error for bad extension scheme requests? | 
|  102   return false; |  103   return false; | 
|  103 } |  104 } | 
|  104  |  105  | 
|  105 bool ShellContentRendererClient::IsExternalPepperPlugin( |  106 bool ShellContentRendererClient::IsExternalPepperPlugin( | 
|  106     const std::string& module_name) { |  107     const std::string& module_name) { | 
|  107 #if !defined(DISABLE_NACL) |  108 #if !defined(DISABLE_NACL) | 
|  108   // TODO(bbudge) remove this when the trusted NaCl plugin has been removed. |  109   // TODO(bbudge) remove this when the trusted NaCl plugin has been removed. | 
|  109   // We must defer certain plugin events for NaCl instances since we switch |  110   // We must defer certain plugin events for NaCl instances since we switch | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
|  139 void ShellContentRendererClient::RunScriptsAtDocumentEnd( |  140 void ShellContentRendererClient::RunScriptsAtDocumentEnd( | 
|  140     content::RenderFrame* render_frame) { |  141     content::RenderFrame* render_frame) { | 
|  141   extension_dispatcher_->RunScriptsAtDocumentEnd(render_frame); |  142   extension_dispatcher_->RunScriptsAtDocumentEnd(render_frame); | 
|  142 } |  143 } | 
|  143  |  144  | 
|  144 ExtensionsClient* ShellContentRendererClient::CreateExtensionsClient() { |  145 ExtensionsClient* ShellContentRendererClient::CreateExtensionsClient() { | 
|  145   return new ShellExtensionsClient; |  146   return new ShellExtensionsClient; | 
|  146 } |  147 } | 
|  147  |  148  | 
|  148 }  // namespace extensions |  149 }  // namespace extensions | 
| OLD | NEW |