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

Unified Diff: chrome/browser/ui/hung_plugin_tab_helper.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/hung_plugin_tab_helper.cc
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index 12ef3be61cf7f17c858a6cea049d54c659488f53..85c37e9ac5595d6e5a52214e409663d86c9bd1b3 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -12,11 +12,12 @@
#include "build/build_config.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/locale_settings.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
#include "components/infobars/core/infobar.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_child_process_host_iterator.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/child_process_data.h"
@@ -355,7 +356,7 @@ void HungPluginTabHelper::KillPlugin(int child_id) {
// diagnose inter-process deadlocks.
// Only do that on the Canary channel, for 20% of pepper plugin hangs.
if (base::RandInt(0, 100) < 20) {
- version_info::Channel channel = chrome::VersionInfo::GetChannel();
+ version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::CANARY) {
scoped_ptr<OwnedHandleVector> renderer_handles(new OwnedHandleVector);
HANDLE current_process = ::GetCurrentProcess();
« no previous file with comments | « chrome/browser/ui/extensions/extension_message_bubble_factory.cc ('k') | chrome/browser/ui/panels/panel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698