| 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 "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/debug/crash_logging.h" | 9 #include "base/debug/crash_logging.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 } | 178 } |
| 179 | 179 |
| 180 PluginObserver::~PluginObserver() { | 180 PluginObserver::~PluginObserver() { |
| 181 #if defined(ENABLE_PLUGIN_INSTALLATION) | 181 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 182 STLDeleteValues(&plugin_placeholders_); | 182 STLDeleteValues(&plugin_placeholders_); |
| 183 #endif | 183 #endif |
| 184 } | 184 } |
| 185 | 185 |
| 186 void PluginObserver::RenderFrameCreated( | 186 void PluginObserver::RenderFrameCreated( |
| 187 content::RenderFrameHost* render_frame_host) { | 187 content::RenderFrameHost* render_frame_host) { |
| 188 #if defined(USE_AURA) && defined(OS_WIN) | 188 #if defined(OS_WIN) |
| 189 // If the window belongs to the Ash desktop, before we navigate we need | 189 // If the window belongs to the Ash desktop, before we navigate we need |
| 190 // to tell the renderview that NPAPI plugins are not supported so it does | 190 // to tell the renderview that NPAPI plugins are not supported so it does |
| 191 // not try to instantiate them. The final decision is actually done in | 191 // not try to instantiate them. The final decision is actually done in |
| 192 // the IO thread by PluginInfoMessageFilter of this proces,s but it's more | 192 // the IO thread by PluginInfoMessageFilter of this proces,s but it's more |
| 193 // complex to manage a map of Ash views in PluginInfoMessageFilter than | 193 // complex to manage a map of Ash views in PluginInfoMessageFilter than |
| 194 // just telling the renderer via IPC. | 194 // just telling the renderer via IPC. |
| 195 | 195 |
| 196 // TODO(shrikant): Implement solution which will help associate | 196 // TODO(shrikant): Implement solution which will help associate |
| 197 // render_view_host/webcontents/view/window instance with host desktop. | 197 // render_view_host/webcontents/view/window instance with host desktop. |
| 198 // Refer to issue http://crbug.com/317940. | 198 // Refer to issue http://crbug.com/317940. |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 scoped_ptr<PluginMetadata> plugin; | 411 scoped_ptr<PluginMetadata> plugin; |
| 412 bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier( | 412 bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier( |
| 413 identifier, NULL, &plugin); | 413 identifier, NULL, &plugin); |
| 414 DCHECK(ret); | 414 DCHECK(ret); |
| 415 | 415 |
| 416 PluginMetroModeInfoBarDelegate::Create( | 416 PluginMetroModeInfoBarDelegate::Create( |
| 417 InfoBarService::FromWebContents(web_contents()), | 417 InfoBarService::FromWebContents(web_contents()), |
| 418 PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name()); | 418 PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name()); |
| 419 #endif | 419 #endif |
| 420 } | 420 } |
| OLD | NEW |