chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« chrome/browser/metrics/variations/variations_service.h ('K') | « chrome/browser/password_manager/password_manager_browsertest.cc ('k') | chrome/browser/policy/device_management_service_configuration.cc » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

diff --git a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

index 8d9d7254eb01f03f2db994be38aef3bd9fa2ec50..59549cdcd0dbfeb297ebb4118b89a85f7799e096 100644

--- a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

+++ b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc

@@ -8,9 +8,10 @@

#include "chrome/browser/plugins/plugin_info_message_filter.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"

+#include "chrome/common/channel_info.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/chrome_version_info.h"

#include "chrome/common/pepper_permission_util.h"

+#include "components/version_info/version_info.h"

#include "content/public/browser/render_process_host.h"

#include "ppapi/host/ppapi_host.h"

#include "ppapi/shared_impl/ppapi_switches.h"

@@ -136,7 +137,7 @@ bool ChromeContentBrowserClientPluginsPart::IsPluginAllowedToUseDevChannelAPIs(

return true;

}

#endif

- version_info::Channel channel = chrome::VersionInfo::GetChannel();

+ version_info::Channel channel = chrome::GetChannel();

// Allow dev channel APIs to be used on "Canary", "Dev", and "Unknown"

// releases of Chrome. Permitting "Unknown" allows these APIs to be used on

// Chromium builds as well.