diff options
| author | thestig <thestig@chromium.org> | 2015-07-29 02:56:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-29 09:57:12 +0000 |
| commit | 50fe7fbd37683dfb84307958b0eae636e046af86 (patch) | |
| tree | fe47ce750ddb5addd769573e6e84a43e4ca7e856 /extensions/common | |
| parent | b4cf4a09c63414336fadb41e1b3c53a9b770dd07 (diff) | |
| download | chromium_src-50fe7fbd37683dfb84307958b0eae636e046af86.zip chromium_src-50fe7fbd37683dfb84307958b0eae636e046af86.tar.gz chromium_src-50fe7fbd37683dfb84307958b0eae636e046af86.tar.bz2 | |
Revert of Override extension_action_redesign flag for Media Router. (patchset #1 id:1 of https://codereview.chromium.org/1258313004/)
Reason for revert:
Triggering WrenchMenuModelTest failures on memory.fyi. See https://crbug.com/515028 for more info.
Original issue's description:
> Override extension_action_redesign flag for Media Router.
>
> R=rdevlin.cronin@chromium.org
> CC=mfoltz@chromium.org
> BUG=514694
>
> Committed: https://crrev.com/8dc6bc26496c0aeb815e3f7ff87a51fd65550b48
> Cr-Commit-Position: refs/heads/master@{#340791}
TBR=rdevlin.cronin@chromium.org,kmarshall@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=514694
Review URL: https://codereview.chromium.org/1260413003
Cr-Commit-Position: refs/heads/master@{#340869}
Diffstat (limited to 'extensions/common')
| -rw-r--r-- | extensions/common/feature_switch.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/extensions/common/feature_switch.cc b/extensions/common/feature_switch.cc index e60e1d4..38b21b5 100644 --- a/extensions/common/feature_switch.cc +++ b/extensions/common/feature_switch.cc @@ -86,17 +86,6 @@ FeatureSwitch* FeatureSwitch::enable_override_bookmarks_ui() { return &g_common_switches.Get().enable_override_bookmarks_ui; } FeatureSwitch* FeatureSwitch::extension_action_redesign() { -#if defined(ENABLE_MEDIA_ROUTER) - // Force-enable the redesigned extension action toolbar when the Media Router - // is enabled. Should be removed when the toolbar redesign is used by default. - // See crbug.com/514694 - // TODO(kmarshall): Remove this override. - if (base::CommandLine::ForCurrentProcess()->HasSwitch( - "enable-media-router")) { - g_common_switches.Get().extension_action_redesign.SetOverrideValue( - FeatureSwitch::OVERRIDE_ENABLED); - } -#endif // defined(ENABLE_MEDIA_ROUTER) return &g_common_switches.Get().extension_action_redesign; } FeatureSwitch* FeatureSwitch::scripts_require_action() { |