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

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

Issue 2691043002: Discard pinning an app with non-empty launcher id. (Closed)
Patch Set: Created 3 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/chrome_launcher_controller_impl.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/common/shelf/app_list_button.h" 9 #include "ash/common/shelf/app_list_button.h"
10 #include "ash/common/shelf/shelf_button.h" 10 #include "ash/common/shelf/shelf_button.h"
(...skipping 18 matching lines...) Expand all
29 #include "build/build_config.h" 29 #include "build/build_config.h"
30 #include "chrome/browser/apps/app_browsertest_util.h" 30 #include "chrome/browser/apps/app_browsertest_util.h"
31 #include "chrome/browser/chrome_notification_types.h" 31 #include "chrome/browser/chrome_notification_types.h"
32 #include "chrome/browser/extensions/extension_apitest.h" 32 #include "chrome/browser/extensions/extension_apitest.h"
33 #include "chrome/browser/extensions/extension_browsertest.h" 33 #include "chrome/browser/extensions/extension_browsertest.h"
34 #include "chrome/browser/extensions/extension_function_test_utils.h" 34 #include "chrome/browser/extensions/extension_function_test_utils.h"
35 #include "chrome/browser/extensions/extension_service.h" 35 #include "chrome/browser/extensions/extension_service.h"
36 #include "chrome/browser/extensions/launch_util.h" 36 #include "chrome/browser/extensions/launch_util.h"
37 #include "chrome/browser/profiles/profile.h" 37 #include "chrome/browser/profiles/profile.h"
38 #include "chrome/browser/ui/app_list/app_list_service.h" 38 #include "chrome/browser/ui/app_list/app_list_service.h"
39 #include "chrome/browser/ui/ash/app_launcher_id.h"
39 #include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h" 40 #include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h"
40 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h" 41 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"
41 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" 42 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
42 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 43 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
43 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 44 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
44 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 45 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
45 #include "chrome/browser/ui/ash/session_controller_client.h" 46 #include "chrome/browser/ui/ash/session_controller_client.h"
46 #include "chrome/browser/ui/browser.h" 47 #include "chrome/browser/ui/browser.h"
47 #include "chrome/browser/ui/browser_commands.h" 48 #include "chrome/browser/ui/browser_commands.h"
48 #include "chrome/browser/ui/browser_finder.h" 49 #include "chrome/browser/ui/browser_finder.h"
(...skipping 2363 matching lines...) Expand 10 before | Expand all | Expand 10 after
2412 2413
2413 // Close all windows via the menu item. 2414 // Close all windows via the menu item.
2414 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE); 2415 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
2415 EXPECT_EQ(0u, BrowserList::GetInstance()->size()); 2416 EXPECT_EQ(0u, BrowserList::GetInstance()->size());
2416 2417
2417 // Check if "Close" is removed from the context menu. 2418 // Check if "Close" is removed from the context menu.
2418 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu(); 2419 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
2419 ASSERT_FALSE( 2420 ASSERT_FALSE(
2420 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE)); 2421 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
2421 } 2422 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698