chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc - Issue 10704023: Moved ExtensionPrefs and related into extensions namespace

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/ui/views/ash/launcher/launcher_context_menu.cc

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Latest-er master merged in Created 8 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

« no previous file with comments | « chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc

diff --git a/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc

index 75cf697b5f31c89b175ca88797f34fc5af6b33af..3d9920c177c90dd6da8428d4faaf1cede6434a1b 100644

--- a/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc

+++ b/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc

@@ -83,16 +83,16 @@ bool LauncherContextMenu::IsCommandIdChecked(int command_id) const {

switch (command_id) {

case LAUNCH_TYPE_PINNED_TAB:

return controller_->GetLaunchType(item_.id) ==

- ExtensionPrefs::LAUNCH_PINNED;

+ extensions::ExtensionPrefs::LAUNCH_PINNED;

case LAUNCH_TYPE_REGULAR_TAB:

return controller_->GetLaunchType(item_.id) ==

- ExtensionPrefs::LAUNCH_REGULAR;

+ extensions::ExtensionPrefs::LAUNCH_REGULAR;

case LAUNCH_TYPE_WINDOW:

return controller_->GetLaunchType(item_.id) ==

- ExtensionPrefs::LAUNCH_WINDOW;

+ extensions::ExtensionPrefs::LAUNCH_WINDOW;

case LAUNCH_TYPE_FULLSCREEN:

return controller_->GetLaunchType(item_.id) ==

- ExtensionPrefs::LAUNCH_FULLSCREEN;

+ extensions::ExtensionPrefs::LAUNCH_FULLSCREEN;

case MENU_AUTO_HIDE:

return ash::LauncherContextMenu::IsAutoHideMenuHideChecked();

default:

@@ -128,16 +128,20 @@ void LauncherContextMenu::ExecuteCommand(int command_id) {

controller_->TogglePinned(item_.id);

break;

case LAUNCH_TYPE_PINNED_TAB:

- controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_PINNED);

+ controller_->SetLaunchType(item_.id,

+ extensions::ExtensionPrefs::LAUNCH_PINNED);

break;

case LAUNCH_TYPE_REGULAR_TAB:

- controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_REGULAR);

+ controller_->SetLaunchType(item_.id,

+ extensions::ExtensionPrefs::LAUNCH_REGULAR);

break;

case LAUNCH_TYPE_WINDOW:

- controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_WINDOW);

+ controller_->SetLaunchType(item_.id,

+ extensions::ExtensionPrefs::LAUNCH_WINDOW);

break;

case LAUNCH_TYPE_FULLSCREEN:

- controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_FULLSCREEN);

+ controller_->SetLaunchType(item_.id,

+ extensions::ExtensionPrefs::LAUNCH_FULLSCREEN);

break;

case MENU_AUTO_HIDE:

controller_->SetAutoHideBehavior(