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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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) 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 <memory> 7 #include <memory>
8 8
9 #include "ash/common/wm_shell.h"
10 #include "ash/common/wm_window.h"
9 #include "ash/root_window_controller.h" 11 #include "ash/root_window_controller.h"
10 #include "ash/shelf/shelf_item_types.h" 12 #include "ash/shelf/shelf_item_types.h"
11 #include "ash/shell.h" 13 #include "ash/shell.h"
12 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
13 #include "ash/wm_shell.h"
14 #include "ash/wm_window.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "chrome/app/chrome_command_ids.h" 17 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/prefs/incognito_mode_prefs.h" 18 #include "chrome/browser/prefs/incognito_mode_prefs.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/app_list/arc/arc_app_test.h" 20 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
21 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h" 21 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
22 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h" 22 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
23 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h" 23 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"
24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" 24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 widget->SetFullscreen(true); 301 widget->SetFullscreen(true);
302 std::unique_ptr<LauncherContextMenu> primary_menu(CreateLauncherContextMenu( 302 std::unique_ptr<LauncherContextMenu> primary_menu(CreateLauncherContextMenu(
303 ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id))); 303 ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
304 std::unique_ptr<LauncherContextMenu> secondary_menu(CreateLauncherContextMenu( 304 std::unique_ptr<LauncherContextMenu> secondary_menu(CreateLauncherContextMenu(
305 ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(secondary_id))); 305 ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(secondary_id)));
306 EXPECT_FALSE(IsItemPresentInMenu(primary_menu.get(), 306 EXPECT_FALSE(IsItemPresentInMenu(primary_menu.get(),
307 LauncherContextMenu::MENU_AUTO_HIDE)); 307 LauncherContextMenu::MENU_AUTO_HIDE));
308 EXPECT_TRUE(IsItemPresentInMenu(secondary_menu.get(), 308 EXPECT_TRUE(IsItemPresentInMenu(secondary_menu.get(),
309 LauncherContextMenu::MENU_AUTO_HIDE)); 309 LauncherContextMenu::MENU_AUTO_HIDE));
310 } 310 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698