chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc - Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature.

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/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

Issue 22299009: Move channel-related (Chrome-specific) global state out of Feature. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

diff --git a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

index eabfc1c76d12b1cbeb4094e81ed89e59d1613cee..ef7fc9a0a851d6302b5f58dfc0c4808bb3e2f44c 100644

--- a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

+++ b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

@@ -10,7 +10,7 @@

#include "chrome/browser/extensions/shell_window_registry.h"

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

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

-#include "chrome/common/extensions/features/feature.h"

+#include "chrome/common/extensions/features/feature_channel.h"

#include "extensions/common/switches.h"

using apps::ShellWindow;

@@ -123,7 +123,7 @@ bool AppCurrentWindowInternalSetBoundsFunction::RunWithWindow(

bool AppCurrentWindowInternalSetIconFunction::RunWithWindow(

ShellWindow* window) {

- if (Feature::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV &&

+ if (GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV &&

GetExtension()->location() != extensions::Manifest::COMPONENT) {

error_ = kDevChannelOnly;

return false;

« no previous file with comments | « no previous file | chrome/browser/extensions/api/app_window/app_window_api.cc » ('j') | no next file with comments »