| 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 #include "chrome/browser/plugins/plugin_observer.h" | 5 #include "chrome/browser/plugins/plugin_observer.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" | 
| 10 #include "base/bind.h" | 10 #include "base/bind.h" | 
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 305   DISALLOW_COPY_AND_ASSIGN(ComponentObserver); | 305   DISALLOW_COPY_AND_ASSIGN(ComponentObserver); | 
| 306 }; | 306 }; | 
| 307 | 307 | 
| 308 PluginObserver::PluginObserver(content::WebContents* web_contents) | 308 PluginObserver::PluginObserver(content::WebContents* web_contents) | 
| 309     : content::WebContentsObserver(web_contents), | 309     : content::WebContentsObserver(web_contents), | 
| 310       weak_ptr_factory_(this) { | 310       weak_ptr_factory_(this) { | 
| 311 } | 311 } | 
| 312 | 312 | 
| 313 PluginObserver::~PluginObserver() { | 313 PluginObserver::~PluginObserver() { | 
| 314 #if defined(ENABLE_PLUGIN_INSTALLATION) | 314 #if defined(ENABLE_PLUGIN_INSTALLATION) | 
| 315   STLDeleteValues(&plugin_placeholders_); | 315   base::STLDeleteValues(&plugin_placeholders_); | 
| 316 #endif | 316 #endif | 
| 317 } | 317 } | 
| 318 | 318 | 
| 319 void PluginObserver::PluginCrashed(const base::FilePath& plugin_path, | 319 void PluginObserver::PluginCrashed(const base::FilePath& plugin_path, | 
| 320                                    base::ProcessId plugin_pid) { | 320                                    base::ProcessId plugin_pid) { | 
| 321   DCHECK(!plugin_path.value().empty()); | 321   DCHECK(!plugin_path.value().empty()); | 
| 322 | 322 | 
| 323   base::string16 plugin_name = | 323   base::string16 plugin_name = | 
| 324       PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path); | 324       PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path); | 
| 325   base::string16 infobar_text; | 325   base::string16 infobar_text; | 
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 460       IDR_INFOBAR_PLUGIN_CRASHED, | 460       IDR_INFOBAR_PLUGIN_CRASHED, | 
| 461 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) | 461 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) | 
| 462       gfx::VectorIconId::EXTENSION_CRASHED, | 462       gfx::VectorIconId::EXTENSION_CRASHED, | 
| 463 #else | 463 #else | 
| 464       gfx::VectorIconId::VECTOR_ICON_NONE, | 464       gfx::VectorIconId::VECTOR_ICON_NONE, | 
| 465 #endif | 465 #endif | 
| 466       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT, | 466       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT, | 
| 467                                  plugin_name), | 467                                  plugin_name), | 
| 468       true); | 468       true); | 
| 469 } | 469 } | 
| OLD | NEW | 
|---|