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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 584513003: Move extension_test_message_listener to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 | « chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc ('k') | chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm » ('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.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/display/display_controller.h" 8 #include "ash/display/display_controller.h"
9 #include "ash/shelf/shelf.h" 9 #include "ash/shelf/shelf.h"
10 #include "ash/shelf/shelf_button.h" 10 #include "ash/shelf/shelf_button.h"
11 #include "ash/shelf/shelf_constants.h" 11 #include "ash/shelf/shelf_constants.h"
12 #include "ash/shelf/shelf_model.h" 12 #include "ash/shelf/shelf_model.h"
13 #include "ash/shelf/shelf_util.h" 13 #include "ash/shelf/shelf_util.h"
14 #include "ash/shelf/shelf_view.h" 14 #include "ash/shelf/shelf_view.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/test/app_list_controller_test_api.h" 16 #include "ash/test/app_list_controller_test_api.h"
17 #include "ash/test/shelf_test_api.h" 17 #include "ash/test/shelf_test_api.h"
18 #include "ash/test/shelf_view_test_api.h" 18 #include "ash/test/shelf_view_test_api.h"
19 #include "ash/test/shell_test_api.h" 19 #include "ash/test/shell_test_api.h"
20 #include "ash/wm/window_state.h" 20 #include "ash/wm/window_state.h"
21 #include "ash/wm/window_util.h" 21 #include "ash/wm/window_util.h"
22 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
23 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
24 #include "chrome/browser/apps/app_browsertest_util.h" 24 #include "chrome/browser/apps/app_browsertest_util.h"
25 #include "chrome/browser/chrome_notification_types.h" 25 #include "chrome/browser/chrome_notification_types.h"
26 #include "chrome/browser/extensions/extension_apitest.h" 26 #include "chrome/browser/extensions/extension_apitest.h"
27 #include "chrome/browser/extensions/extension_browsertest.h" 27 #include "chrome/browser/extensions/extension_browsertest.h"
28 #include "chrome/browser/extensions/extension_function_test_utils.h" 28 #include "chrome/browser/extensions/extension_function_test_utils.h"
29 #include "chrome/browser/extensions/extension_service.h" 29 #include "chrome/browser/extensions/extension_service.h"
30 #include "chrome/browser/extensions/extension_test_message_listener.h"
31 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/browser/ui/app_list/app_list_service.h" 31 #include "chrome/browser/ui/app_list/app_list_service.h"
33 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h" 32 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"
34 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 33 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
35 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 34 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
36 #include "chrome/browser/ui/browser.h" 35 #include "chrome/browser/ui/browser.h"
37 #include "chrome/browser/ui/browser_commands.h" 36 #include "chrome/browser/ui/browser_commands.h"
38 #include "chrome/browser/ui/browser_finder.h" 37 #include "chrome/browser/ui/browser_finder.h"
39 #include "chrome/browser/ui/browser_list.h" 38 #include "chrome/browser/ui/browser_list.h"
40 #include "chrome/browser/ui/browser_window.h" 39 #include "chrome/browser/ui/browser_window.h"
41 #include "chrome/browser/ui/chrome_pages.h" 40 #include "chrome/browser/ui/chrome_pages.h"
42 #include "chrome/browser/ui/extensions/application_launch.h" 41 #include "chrome/browser/ui/extensions/application_launch.h"
43 #include "chrome/browser/ui/host_desktop.h" 42 #include "chrome/browser/ui/host_desktop.h"
44 #include "chrome/browser/ui/settings_window_manager.h" 43 #include "chrome/browser/ui/settings_window_manager.h"
45 #include "chrome/browser/ui/tabs/tab_strip_model.h" 44 #include "chrome/browser/ui/tabs/tab_strip_model.h"
46 #include "chrome/common/chrome_switches.h" 45 #include "chrome/common/chrome_switches.h"
47 #include "chrome/test/base/ui_test_utils.h" 46 #include "chrome/test/base/ui_test_utils.h"
48 #include "content/public/browser/notification_service.h" 47 #include "content/public/browser/notification_service.h"
49 #include "content/public/browser/notification_source.h" 48 #include "content/public/browser/notification_source.h"
50 #include "content/public/browser/web_contents.h" 49 #include "content/public/browser/web_contents.h"
51 #include "content/public/test/browser_test_utils.h" 50 #include "content/public/test/browser_test_utils.h"
52 #include "extensions/browser/app_window/app_window.h" 51 #include "extensions/browser/app_window/app_window.h"
53 #include "extensions/browser/app_window/app_window_registry.h" 52 #include "extensions/browser/app_window/app_window_registry.h"
54 #include "extensions/browser/app_window/native_app_window.h" 53 #include "extensions/browser/app_window/native_app_window.h"
55 #include "extensions/browser/extension_system.h" 54 #include "extensions/browser/extension_system.h"
56 #include "extensions/common/constants.h" 55 #include "extensions/common/constants.h"
57 #include "extensions/common/switches.h" 56 #include "extensions/common/switches.h"
57 #include "extensions/test/extension_test_message_listener.h"
58 #include "testing/gtest/include/gtest/gtest.h" 58 #include "testing/gtest/include/gtest/gtest.h"
59 #include "ui/app_list/views/apps_grid_view.h" 59 #include "ui/app_list/views/apps_grid_view.h"
60 #include "ui/aura/client/aura_constants.h" 60 #include "ui/aura/client/aura_constants.h"
61 #include "ui/aura/window.h" 61 #include "ui/aura/window.h"
62 #include "ui/events/event.h" 62 #include "ui/events/event.h"
63 #include "ui/events/test/event_generator.h" 63 #include "ui/events/test/event_generator.h"
64 64
65 using extensions::AppWindow; 65 using extensions::AppWindow;
66 using extensions::Extension; 66 using extensions::Extension;
67 using content::WebContents; 67 using content::WebContents;
(...skipping 2058 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 chrome::GetSettingsUrl(std::string())); 2126 chrome::GetSettingsUrl(std::string()));
2127 Browser* settings_browser = 2127 Browser* settings_browser =
2128 settings_manager->FindBrowserForProfile(browser()->profile()); 2128 settings_manager->FindBrowserForProfile(browser()->profile());
2129 ASSERT_TRUE(settings_browser); 2129 ASSERT_TRUE(settings_browser);
2130 EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false)); 2130 EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false));
2131 EXPECT_EQ(item_count + 1, shelf_model->item_count()); 2131 EXPECT_EQ(item_count + 1, shelf_model->item_count());
2132 2132
2133 // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded. 2133 // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded.
2134 // crbug.com/230464. 2134 // crbug.com/230464.
2135 } 2135 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc ('k') | chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698