Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 103623003: Instrument pepper plugin load failures. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 4431 matching lines...) Expand 10 before | Expand all | Expand 10 after
4442 const WebPluginInfo& info, 4442 const WebPluginInfo& info,
4443 const blink::WebPluginParams& params) { 4443 const blink::WebPluginParams& params) {
4444 #if defined(ENABLE_PLUGINS) 4444 #if defined(ENABLE_PLUGINS)
4445 bool pepper_plugin_was_registered = false; 4445 bool pepper_plugin_was_registered = false;
4446 scoped_refptr<PluginModule> pepper_module(PluginModule::Create( 4446 scoped_refptr<PluginModule> pepper_module(PluginModule::Create(
4447 this, info, &pepper_plugin_was_registered)); 4447 this, info, &pepper_plugin_was_registered));
4448 if (pepper_plugin_was_registered) { 4448 if (pepper_plugin_was_registered) {
4449 if (pepper_module.get()) 4449 if (pepper_module.get())
4450 return new PepperWebPluginImpl(pepper_module.get(), params, AsWeakPtr()); 4450 return new PepperWebPluginImpl(pepper_module.get(), params, AsWeakPtr());
4451 } 4451 }
4452 4452 #if defined(OS_CHROMEOS)
4453 LOG(WARNING) << "Pepper module/plugin creation failed.";
4454 return NULL;
4455 #else
4453 return new WebPluginImpl(frame, params, info.path, AsWeakPtr()); 4456 return new WebPluginImpl(frame, params, info.path, AsWeakPtr());
4457 #endif
4454 #else 4458 #else
4455 return NULL; 4459 return NULL;
4456 #endif 4460 #endif
4457 } 4461 }
4458 4462
4459 void RenderViewImpl::EvaluateScript(const string16& frame_xpath, 4463 void RenderViewImpl::EvaluateScript(const string16& frame_xpath,
4460 const string16& jscript, 4464 const string16& jscript,
4461 int id, 4465 int id,
4462 bool notify_result) { 4466 bool notify_result) {
4463 v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); 4467 v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
(...skipping 2229 matching lines...) Expand 10 before | Expand all | Expand 10 after
6693 for (size_t i = 0; i < icon_urls.size(); i++) { 6697 for (size_t i = 0; i < icon_urls.size(); i++) {
6694 WebURL url = icon_urls[i].iconURL(); 6698 WebURL url = icon_urls[i].iconURL();
6695 if (!url.isEmpty()) 6699 if (!url.isEmpty())
6696 urls.push_back(FaviconURL(url, 6700 urls.push_back(FaviconURL(url,
6697 ToFaviconType(icon_urls[i].iconType()))); 6701 ToFaviconType(icon_urls[i].iconType())));
6698 } 6702 }
6699 SendUpdateFaviconURL(urls); 6703 SendUpdateFaviconURL(urls);
6700 } 6704 }
6701 6705
6702 } // namespace content 6706 } // namespace content
OLDNEW
« content/browser/ppapi_plugin_process_host.cc ('K') | « content/browser/ppapi_plugin_process_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698