chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc - Issue 115113006: Rename Launcher to Shelf.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ShelfTestAPI Created 7 years 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 | Annotate | Revision Log

« chrome/browser/ui/ash/launcher/chrome_launcher_controller.h ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/ash/launcher/launcher_context_menu.h"	5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

6	6

7 #include "ash/launcher/launcher.h"

8 #include "ash/launcher/launcher_types.h"	7 #include "ash/launcher/launcher_types.h"

	8 #include "ash/shelf/shelf.h"

9 #include "ash/shelf/shelf_model.h"	9 #include "ash/shelf/shelf_model.h"

10 #include "ash/test/ash_test_base.h"	10 #include "ash/test/ash_test_base.h"

11 #include "base/prefs/pref_service.h"	11 #include "base/prefs/pref_service.h"

12 #include "chrome/app/chrome_command_ids.h"	12 #include "chrome/app/chrome_command_ids.h"

13 #include "chrome/browser/prefs/incognito_mode_prefs.h"	13 #include "chrome/browser/prefs/incognito_mode_prefs.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

16 #include "chrome/test/base/testing_profile.h"	16 #include "chrome/test/base/testing_profile.h"

17 #include "ui/aura/root_window.h"	17 #include "ui/aura/root_window.h"

18	18

(...skipping 82 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
101 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));	101 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));

102	102

103 // Disable Incognito mode.	103 // Disable Incognito mode.

104 IncognitoModePrefs::SetAvailability(profile()->GetPrefs(),	104 IncognitoModePrefs::SetAvailability(profile()->GetPrefs(),

105 IncognitoModePrefs::FORCED);	105 IncognitoModePrefs::FORCED);

106 menu.reset(CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));	106 menu.reset(CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));

107 ASSERT_TRUE(IsItemPresentInMenu(	107 ASSERT_TRUE(IsItemPresentInMenu(

108 menu.get(), LauncherContextMenu::MENU_NEW_WINDOW));	108 menu.get(), LauncherContextMenu::MENU_NEW_WINDOW));

109 EXPECT_FALSE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));	109 EXPECT_FALSE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_NEW_WINDOW));

110 }	110 }

OLD	NEW