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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months 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
« no previous file with comments | « chrome/browser/plugins/plugin_installer.cc ('k') | chrome/browser/policy/policy_browsertest.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/debug/crash_logging.h" 9 #include "base/debug/crash_logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 delete it->second; 447 delete it->second;
448 plugin_placeholders_.erase(it); 448 plugin_placeholders_.erase(it);
449 } 449 }
450 #endif // defined(ENABLE_PLUGIN_INSTALLATION) 450 #endif // defined(ENABLE_PLUGIN_INSTALLATION)
451 451
452 void PluginObserver::OnOpenAboutPlugins() { 452 void PluginObserver::OnOpenAboutPlugins() {
453 web_contents()->OpenURL(OpenURLParams( 453 web_contents()->OpenURL(OpenURLParams(
454 GURL(chrome::kChromeUIPluginsURL), 454 GURL(chrome::kChromeUIPluginsURL),
455 content::Referrer(web_contents()->GetURL(), 455 content::Referrer(web_contents()->GetURL(),
456 blink::WebReferrerPolicyDefault), 456 blink::WebReferrerPolicyDefault),
457 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK, false)); 457 NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
458 } 458 }
459 459
460 void PluginObserver::OnCouldNotLoadPlugin(const base::FilePath& plugin_path) { 460 void PluginObserver::OnCouldNotLoadPlugin(const base::FilePath& plugin_path) {
461 g_browser_process->GetMetricsServicesManager()->OnPluginLoadingError( 461 g_browser_process->GetMetricsServicesManager()->OnPluginLoadingError(
462 plugin_path); 462 plugin_path);
463 base::string16 plugin_name = 463 base::string16 plugin_name =
464 PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path); 464 PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path);
465 SimpleAlertInfoBarDelegate::Create( 465 SimpleAlertInfoBarDelegate::Create(
466 InfoBarService::FromWebContents(web_contents()), 466 InfoBarService::FromWebContents(web_contents()),
467 IDR_INFOBAR_PLUGIN_CRASHED, 467 IDR_INFOBAR_PLUGIN_CRASHED,
(...skipping 24 matching lines...) Expand all
492 scoped_ptr<PluginMetadata> plugin; 492 scoped_ptr<PluginMetadata> plugin;
493 bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier( 493 bool ret = PluginFinder::GetInstance()->FindPluginWithIdentifier(
494 identifier, NULL, &plugin); 494 identifier, NULL, &plugin);
495 DCHECK(ret); 495 DCHECK(ret);
496 496
497 PluginMetroModeInfoBarDelegate::Create( 497 PluginMetroModeInfoBarDelegate::Create(
498 InfoBarService::FromWebContents(web_contents()), 498 InfoBarService::FromWebContents(web_contents()),
499 PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name()); 499 PluginMetroModeInfoBarDelegate::DESKTOP_MODE_REQUIRED, plugin->name());
500 #endif 500 #endif
501 } 501 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_installer.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698