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

Side by Side Diff: chrome/browser/plugins/plugin_observer.cc

Issue 11361046: Remove TabContents from TabModalConfirmDialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing include Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/download/download_danger_prompt.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 void PluginObserver::InstallMissingPlugin( 315 void PluginObserver::InstallMissingPlugin(
316 PluginInstaller* installer, 316 PluginInstaller* installer,
317 scoped_ptr<PluginMetadata> plugin_metadata) { 317 scoped_ptr<PluginMetadata> plugin_metadata) {
318 if (plugin_metadata->url_for_display()) { 318 if (plugin_metadata->url_for_display()) {
319 installer->OpenDownloadURL(plugin_metadata->plugin_url(), web_contents()); 319 installer->OpenDownloadURL(plugin_metadata->plugin_url(), web_contents());
320 } else { 320 } else {
321 TabModalConfirmDialog::Create( 321 TabModalConfirmDialog::Create(
322 new ConfirmInstallDialogDelegate( 322 new ConfirmInstallDialogDelegate(
323 web_contents(), installer, plugin_metadata.Pass()), 323 web_contents(), installer, plugin_metadata.Pass()),
324 TabContents::FromWebContents(web_contents())); 324 web_contents());
325 } 325 }
326 } 326 }
327 327
328 void PluginObserver::OnRemovePluginPlaceholderHost(int placeholder_id) { 328 void PluginObserver::OnRemovePluginPlaceholderHost(int placeholder_id) {
329 std::map<int, PluginPlaceholderHost*>::iterator it = 329 std::map<int, PluginPlaceholderHost*>::iterator it =
330 plugin_placeholders_.find(placeholder_id); 330 plugin_placeholders_.find(placeholder_id);
331 if (it == plugin_placeholders_.end()) { 331 if (it == plugin_placeholders_.end()) {
332 NOTREACHED(); 332 NOTREACHED();
333 return; 333 return;
334 } 334 }
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 infobar_helper->AddInfoBar( 379 infobar_helper->AddInfoBar(
380 new PluginMetroModeInfoBarDelegate( 380 new PluginMetroModeInfoBarDelegate(
381 infobar_helper, 381 infobar_helper,
382 l10n_util::GetStringFUTF16(IDS_METRO_NPAPI_PLUGIN_PROMPT, 382 l10n_util::GetStringFUTF16(IDS_METRO_NPAPI_PLUGIN_PROMPT,
383 plugin->name()), 383 plugin->name()),
384 l10n_util::GetStringUTF16(IDS_WIN8_RESTART))); 384 l10n_util::GetStringUTF16(IDS_WIN8_RESTART)));
385 #else 385 #else
386 NOTREACHED(); 386 NOTREACHED();
387 #endif 387 #endif
388 } 388 }
OLDNEW
« no previous file with comments | « chrome/browser/download/download_danger_prompt.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698