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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.h

Issue 11471027: Added more tests for IncognitoModeAvailability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add render_view_context_menu_test_util to unit_test and browser_tests. Created 7 years, 11 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/ui/ash/launcher/launcher_context_menu.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index 185e6031818a1eae7feab54b4662182ade95940d..1ae1bb49af97ccdcfde4ab2f1027b55085d3e14f 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -25,6 +25,20 @@ class ContextMenuMatcher;
class LauncherContextMenu : public ui::SimpleMenuModel,
public ui::SimpleMenuModel::Delegate {
public:
+ enum MenuItem {
sky 2013/01/14 16:03:37 I don't like making these public just for a test,
rustema 2013/01/15 07:37:40 Done.
+ MENU_OPEN_NEW,
+ MENU_CLOSE,
+ MENU_PIN,
+ LAUNCH_TYPE_PINNED_TAB,
+ LAUNCH_TYPE_REGULAR_TAB,
+ LAUNCH_TYPE_FULLSCREEN,
+ LAUNCH_TYPE_WINDOW,
+ MENU_AUTO_HIDE,
+ MENU_NEW_WINDOW,
+ MENU_NEW_INCOGNITO_WINDOW,
+ MENU_ALIGNMENT_MENU,
+ MENU_CHANGE_WALLPAPER,
+ };
// |item| is NULL if the context menu is for the launcher (the user right
// |clicked on an area with no icons).
LauncherContextMenu(ChromeLauncherController* controller,
@@ -51,21 +65,6 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
virtual void ExecuteCommand(int command_id) OVERRIDE;
private:
- enum MenuItem {
- MENU_OPEN_NEW,
- MENU_CLOSE,
- MENU_PIN,
- LAUNCH_TYPE_PINNED_TAB,
- LAUNCH_TYPE_REGULAR_TAB,
- LAUNCH_TYPE_FULLSCREEN,
- LAUNCH_TYPE_WINDOW,
- MENU_AUTO_HIDE,
- MENU_NEW_WINDOW,
- MENU_NEW_INCOGNITO_WINDOW,
- MENU_ALIGNMENT_MENU,
- MENU_CHANGE_WALLPAPER,
- };
-
// Does |item_| represent a valid item? See description of constructor for
// details on why it may not be valid.
bool is_valid_item() const { return item_.id != 0; }

Powered by Google App Engine
This is Rietveld 408576698