| OLD | NEW |
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 11 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
| 12 #include "chrome/browser/ui/app_list/app_list_service.h" | 12 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 13 #include "chrome/browser/ui/app_list/test/chrome_app_list_test_support.h" | 13 #include "chrome/browser/ui/app_list/test/chrome_app_list_test_support.h" |
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
| 16 #include "chrome/browser/ui/host_desktop.h" | 16 #include "chrome/browser/ui/host_desktop.h" |
| 17 #include "chrome/common/chrome_paths.h" | 17 #include "chrome/common/chrome_paths.h" |
| 18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 19 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
| 20 #include "chrome/test/base/testing_profile.h" | 20 #include "chrome/test/base/testing_profile.h" |
| 21 #include "ui/app_list/app_list_model.h" | 21 #include "ui/app_list/app_list_model.h" |
| 22 #include "ui/app_list/app_list_switches.h" | 22 #include "ui/app_list/app_list_switches.h" |
| 23 #include "ui/app_list/search_box_model.h" | 23 #include "ui/app_list/search_box_model.h" |
| 24 #include "ui/app_list/search_result.h" | 24 #include "ui/app_list/search_result.h" |
| 25 #include "ui/app_list/search_result_observer.h" | 25 #include "ui/app_list/search_result_observer.h" |
| 26 #include "ui/base/models/list_model_observer.h" | 26 #include "ui/base/models/list_model_observer.h" |
| 27 #include "ui/gfx/host_desktop_type.h" |
| 27 | 28 |
| 28 #if defined(OS_CHROMEOS) | 29 #if defined(OS_CHROMEOS) |
| 29 #include "chromeos/chromeos_switches.h" | 30 #include "chromeos/chromeos_switches.h" |
| 30 #include "chromeos/login/user_names.h" | 31 #include "chromeos/login/user_names.h" |
| 31 #endif // defined(OS_CHROMEOS) | 32 #endif // defined(OS_CHROMEOS) |
| 32 | 33 |
| 33 // Browser Test for AppListController that runs on all platforms supporting | 34 // Browser Test for AppListController that runs on all platforms supporting |
| 34 // app_list. | 35 // app_list. |
| 35 typedef InProcessBrowserTest AppListControllerBrowserTest; | 36 typedef InProcessBrowserTest AppListControllerBrowserTest; |
| 36 | 37 |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 // Test creating the initial app list in guest mode. | 197 // Test creating the initial app list in guest mode. |
| 197 IN_PROC_BROWSER_TEST_F(AppListControllerGuestModeBrowserTest, Incognito) { | 198 IN_PROC_BROWSER_TEST_F(AppListControllerGuestModeBrowserTest, Incognito) { |
| 198 AppListService* service = test::GetAppListService(); | 199 AppListService* service = test::GetAppListService(); |
| 199 EXPECT_TRUE(service->GetCurrentAppListProfile()); | 200 EXPECT_TRUE(service->GetCurrentAppListProfile()); |
| 200 | 201 |
| 201 service->ShowForProfile(browser()->profile()); | 202 service->ShowForProfile(browser()->profile()); |
| 202 EXPECT_EQ(browser()->profile(), service->GetCurrentAppListProfile()); | 203 EXPECT_EQ(browser()->profile(), service->GetCurrentAppListProfile()); |
| 203 } | 204 } |
| 204 | 205 |
| 205 #endif // defined(OS_CHROMEOS) | 206 #endif // defined(OS_CHROMEOS) |
| OLD | NEW |