Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h" 5 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"
6 6
7 #include "ash/launcher/launcher_context_menu.h" 7 #include "ash/launcher/launcher_context_menu.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/extensions/extension_prefs.h" 10 #include "chrome/browser/extensions/extension_prefs.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 76 }
77 } 77 }
78 78
79 LauncherContextMenu::~LauncherContextMenu() { 79 LauncherContextMenu::~LauncherContextMenu() {
80 } 80 }
81 81
82 bool LauncherContextMenu::IsCommandIdChecked(int command_id) const { 82 bool LauncherContextMenu::IsCommandIdChecked(int command_id) const {
83 switch (command_id) { 83 switch (command_id) {
84 case LAUNCH_TYPE_PINNED_TAB: 84 case LAUNCH_TYPE_PINNED_TAB:
85 return controller_->GetLaunchType(item_.id) == 85 return controller_->GetLaunchType(item_.id) ==
86 ExtensionPrefs::LAUNCH_PINNED; 86 extensions::ExtensionPrefs::LAUNCH_PINNED;
87 case LAUNCH_TYPE_REGULAR_TAB: 87 case LAUNCH_TYPE_REGULAR_TAB:
88 return controller_->GetLaunchType(item_.id) == 88 return controller_->GetLaunchType(item_.id) ==
89 ExtensionPrefs::LAUNCH_REGULAR; 89 extensions::ExtensionPrefs::LAUNCH_REGULAR;
90 case LAUNCH_TYPE_WINDOW: 90 case LAUNCH_TYPE_WINDOW:
91 return controller_->GetLaunchType(item_.id) == 91 return controller_->GetLaunchType(item_.id) ==
92 ExtensionPrefs::LAUNCH_WINDOW; 92 extensions::ExtensionPrefs::LAUNCH_WINDOW;
93 case LAUNCH_TYPE_FULLSCREEN: 93 case LAUNCH_TYPE_FULLSCREEN:
94 return controller_->GetLaunchType(item_.id) == 94 return controller_->GetLaunchType(item_.id) ==
95 ExtensionPrefs::LAUNCH_FULLSCREEN; 95 extensions::ExtensionPrefs::LAUNCH_FULLSCREEN;
96 case MENU_AUTO_HIDE: 96 case MENU_AUTO_HIDE:
97 return ash::LauncherContextMenu::IsAutoHideMenuHideChecked(); 97 return ash::LauncherContextMenu::IsAutoHideMenuHideChecked();
98 default: 98 default:
99 return false; 99 return false;
100 } 100 }
101 } 101 }
102 102
103 bool LauncherContextMenu::IsCommandIdEnabled(int command_id) const { 103 bool LauncherContextMenu::IsCommandIdEnabled(int command_id) const {
104 switch (command_id) { 104 switch (command_id) {
105 case MENU_PIN: 105 case MENU_PIN:
(...skipping 15 matching lines...) Expand all
121 case MENU_OPEN: 121 case MENU_OPEN:
122 controller_->Open(item_.id, ui::EF_NONE); 122 controller_->Open(item_.id, ui::EF_NONE);
123 break; 123 break;
124 case MENU_CLOSE: 124 case MENU_CLOSE:
125 controller_->Close(item_.id); 125 controller_->Close(item_.id);
126 break; 126 break;
127 case MENU_PIN: 127 case MENU_PIN:
128 controller_->TogglePinned(item_.id); 128 controller_->TogglePinned(item_.id);
129 break; 129 break;
130 case LAUNCH_TYPE_PINNED_TAB: 130 case LAUNCH_TYPE_PINNED_TAB:
131 controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_PINNED); 131 controller_->SetLaunchType(item_.id,
132 extensions::ExtensionPrefs::LAUNCH_PINNED);
132 break; 133 break;
133 case LAUNCH_TYPE_REGULAR_TAB: 134 case LAUNCH_TYPE_REGULAR_TAB:
134 controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_REGULAR); 135 controller_->SetLaunchType(item_.id,
136 extensions::ExtensionPrefs::LAUNCH_REGULAR);
135 break; 137 break;
136 case LAUNCH_TYPE_WINDOW: 138 case LAUNCH_TYPE_WINDOW:
137 controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_WINDOW); 139 controller_->SetLaunchType(item_.id,
140 extensions::ExtensionPrefs::LAUNCH_WINDOW);
138 break; 141 break;
139 case LAUNCH_TYPE_FULLSCREEN: 142 case LAUNCH_TYPE_FULLSCREEN:
140 controller_->SetLaunchType(item_.id, ExtensionPrefs::LAUNCH_FULLSCREEN); 143 controller_->SetLaunchType(item_.id,
144 extensions::ExtensionPrefs::LAUNCH_FULLSCREEN);
141 break; 145 break;
142 case MENU_AUTO_HIDE: 146 case MENU_AUTO_HIDE:
143 controller_->SetAutoHideBehavior( 147 controller_->SetAutoHideBehavior(
144 ash::LauncherContextMenu::GetToggledAutoHideBehavior()); 148 ash::LauncherContextMenu::GetToggledAutoHideBehavior());
145 break; 149 break;
146 case MENU_NEW_WINDOW: 150 case MENU_NEW_WINDOW:
147 controller_->CreateNewWindow(); 151 controller_->CreateNewWindow();
148 break; 152 break;
149 case MENU_NEW_INCOGNITO_WINDOW: 153 case MENU_NEW_INCOGNITO_WINDOW:
150 controller_->CreateNewIncognitoWindow(); 154 controller_->CreateNewIncognitoWindow();
151 break; 155 break;
152 case MENU_ALIGNMENT_MENU: 156 case MENU_ALIGNMENT_MENU:
153 break; 157 break;
154 } 158 }
155 } 159 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698