OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/app_list/app_list_service_views.h" | 5 #include "chrome/browser/ui/app_list/app_list_service_views.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 EXPECT_TRUE(service->GetAppListWindow()); | 93 EXPECT_TRUE(service->GetAppListWindow()); |
94 service->DismissAppList(); // Note: in Ash, this will invalidate the window. | 94 service->DismissAppList(); // Note: in Ash, this will invalidate the window. |
95 | 95 |
96 // Note: no need to sink message queue. | 96 // Note: no need to sink message queue. |
97 EXPECT_FALSE(service->GetAppListWindow()); | 97 EXPECT_FALSE(service->GetAppListWindow()); |
98 } | 98 } |
99 | 99 |
100 // Dismiss the app list via an accelerator when it is the only thing keeping | 100 // Dismiss the app list via an accelerator when it is the only thing keeping |
101 // Chrome alive and expect everything to clean up properly. This is a regression | 101 // Chrome alive and expect everything to clean up properly. This is a regression |
102 // test for http://crbug.com/395937. | 102 // test for http://crbug.com/395937. |
103 // Flaky on Win and Linux. https://crbug.com/477697 | 103 // Flaky on Linux. https://crbug.com/477697 |
104 #if defined(OS_WIN) || defined(OS_LINUX) | 104 #if defined(OS_LINUX) |
105 #define MAYBE_AcceleratorClose DISABLED_AcceleratorClose | 105 #define MAYBE_AcceleratorClose DISABLED_AcceleratorClose |
106 #else | 106 #else |
107 #define MAYBE_AcceleratorClose AcceleratorClose | 107 #define MAYBE_AcceleratorClose AcceleratorClose |
108 #endif | 108 #endif |
109 IN_PROC_BROWSER_TEST_F(AppListServiceViewsBrowserTest, MAYBE_AcceleratorClose) { | 109 IN_PROC_BROWSER_TEST_F(AppListServiceViewsBrowserTest, MAYBE_AcceleratorClose) { |
110 AppListService* service = AppListService::Get(); | 110 AppListService* service = AppListService::Get(); |
111 service->ShowForProfile(browser()->profile()); | 111 service->ShowForProfile(browser()->profile()); |
112 EXPECT_TRUE(service->GetAppListWindow()); | 112 EXPECT_TRUE(service->GetAppListWindow()); |
113 | 113 |
114 content::WindowedNotificationObserver close_observer( | 114 content::WindowedNotificationObserver close_observer( |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 | 240 |
241 service->ShowForAppInstall(browser()->profile(), extension->id(), false); | 241 service->ShowForAppInstall(browser()->profile(), extension->id(), false); |
242 app_list::AppListView* app_list_view = GetAppListView(service); | 242 app_list::AppListView* app_list_view = GetAppListView(service); |
243 ASSERT_TRUE(app_list_view); | 243 ASSERT_TRUE(app_list_view); |
244 | 244 |
245 app_list::ContentsView* contents_view = | 245 app_list::ContentsView* contents_view = |
246 app_list_view->app_list_main_view()->contents_view(); | 246 app_list_view->app_list_main_view()->contents_view(); |
247 | 247 |
248 EXPECT_TRUE(contents_view->IsStateActive(app_list::AppListModel::STATE_APPS)); | 248 EXPECT_TRUE(contents_view->IsStateActive(app_list::AppListModel::STATE_APPS)); |
249 } | 249 } |
OLD | NEW |