chrome/common/extensions/chrome_extensions_client.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/common/extensions/chrome_extensions_client.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:

Index: chrome/common/extensions/chrome_extensions_client.cc

diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc

index 92435d2f56b0d89c0ee3bdf9fe6c69c74ece5e04..b0b353f014bf359d85a83b9e1e88ba666694746b 100644

--- a/chrome/common/extensions/chrome_extensions_client.cc

+++ b/chrome/common/extensions/chrome_extensions_client.cc

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

#include "base/metrics/histogram_macros.h"

#include "base/strings/string_util.h"

#include "base/values.h"

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

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/extensions/api/extension_action/action_info.h"

#include "chrome/common/extensions/api/generated_schemas.h"

#include "chrome/common/extensions/chrome_manifest_handlers.h"

@@ -23,6 +23,7 @@

#include "chrome/grit/common_resources.h"

#include "chrome/grit/extensions_api_resources.h"

#include "chrome/grit/generated_resources.h"

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

#include "content/public/common/url_constants.h"

#include "extensions/common/api/generated_schemas.h"

#include "extensions/common/common_manifest_handlers.h"

@@ -71,7 +72,7 @@ SimpleFeature* CreateFeature() {

return feature;

}

-// Mirrors chrome::VersionInfo for histograms.

+// Mirrors version_info::Channel for histograms.

enum ChromeChannelForHistogram {

CHANNEL_UNKNOWN,

CHANNEL_CANARY,