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

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

Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix control reaches end of non-void function warnings Created 4 years, 4 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
« no previous file with comments | « ash/wm/window_animations.cc ('k') | chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ash_switches.h" 9 #include "ash/common/ash_switches.h"
10 #include "ash/common/shelf/app_list_button.h" 10 #include "ash/common/shelf/app_list_button.h"
11 #include "ash/common/shelf/shelf_button.h" 11 #include "ash/common/shelf/shelf_button.h"
12 #include "ash/common/shelf/shelf_constants.h" 12 #include "ash/common/shelf/shelf_constants.h"
13 #include "ash/common/shelf/shelf_model.h" 13 #include "ash/common/shelf/shelf_model.h"
14 #include "ash/common/shelf/shelf_view.h"
14 #include "ash/common/wm/window_state.h" 15 #include "ash/common/wm/window_state.h"
15 #include "ash/common/wm_shell.h" 16 #include "ash/common/wm_shell.h"
16 #include "ash/shelf/shelf.h" 17 #include "ash/shelf/shelf.h"
17 #include "ash/shelf/shelf_util.h" 18 #include "ash/shelf/shelf_util.h"
18 #include "ash/shelf/shelf_view.h"
19 #include "ash/shell.h" 19 #include "ash/shell.h"
20 #include "ash/test/shelf_test_api.h" 20 #include "ash/test/shelf_test_api.h"
21 #include "ash/test/shelf_view_test_api.h" 21 #include "ash/test/shelf_view_test_api.h"
22 #include "ash/wm/window_state_aura.h" 22 #include "ash/wm/window_state_aura.h"
23 #include "ash/wm/window_util.h" 23 #include "ash/wm/window_util.h"
24 #include "base/macros.h" 24 #include "base/macros.h"
25 #include "base/run_loop.h" 25 #include "base/run_loop.h"
26 #include "base/strings/stringprintf.h" 26 #include "base/strings/stringprintf.h"
27 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
28 #include "build/build_config.h" 28 #include "build/build_config.h"
(...skipping 2371 matching lines...) Expand 10 before | Expand all | Expand 10 after
2400 2400
2401 // Close all windows via the menu item. 2401 // Close all windows via the menu item.
2402 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE); 2402 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
2403 EXPECT_EQ(0u, BrowserList::GetInstance()->size()); 2403 EXPECT_EQ(0u, BrowserList::GetInstance()->size());
2404 2404
2405 // Check if "Close" is removed from the context menu. 2405 // Check if "Close" is removed from the context menu.
2406 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu(); 2406 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
2407 ASSERT_FALSE( 2407 ASSERT_FALSE(
2408 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE)); 2408 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
2409 } 2409 }
OLDNEW
« no previous file with comments | « ash/wm/window_animations.cc ('k') | chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698