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

Unified Diff: chrome/browser/ui/app_list/app_list_controller_browsertest.cc

Issue 24710002: Initial stubs for App Launcher on Linux Aura. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Disable AppListControllerSearchResultsBrowserTest. Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/ui/app_list/app_list_service_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/app_list_controller_browsertest.cc
diff --git a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
index ef0e746c6dff0f28ac1a3e1f0d24527b3c6647ce..e36192b8a9d0345599f6b7624ab9aff1a74f421b 100644
--- a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
@@ -66,6 +66,8 @@ class AppListControllerBrowserTest : public InProcessBrowserTest {
};
// Test the CreateNewWindow function of the controller delegate.
+// TODO(mgiuca): Enable on Linux when supported.
+#if !defined(OS_LINUX)
IN_PROC_BROWSER_TEST_F(AppListControllerBrowserTest, CreateNewWindow) {
const chrome::HostDesktopType desktop = chrome::GetActiveDesktop();
AppListService* service = AppListService::Get();
@@ -84,8 +86,10 @@ IN_PROC_BROWSER_TEST_F(AppListControllerBrowserTest, CreateNewWindow) {
EXPECT_EQ(1U, chrome::GetBrowserCount(
browser()->profile()->GetOffTheRecordProfile(), desktop));
}
+#endif // !defined(OS_LINUX)
-#if !defined(OS_CHROMEOS)
+// TODO(mgiuca): Enable on Linux when supported.
+#if !defined(OS_CHROMEOS) && !defined(OS_LINUX)
// Show the app list, then dismiss it.
IN_PROC_BROWSER_TEST_F(AppListControllerBrowserTest, ShowAndDismiss) {
AppListService* service = AppListService::Get();
@@ -194,7 +198,7 @@ IN_PROC_BROWSER_TEST_F(ShowAppListBrowserTest, ShowAppListFlag) {
CreateBrowser(service->GetCurrentAppListProfile());
service->DismissAppList();
}
-#endif // !defined(OS_CHROMEOS)
+#endif // !defined(OS_CHROMEOS) && !defined(OS_LINUX)
// Browser Test for AppListController that observes search result changes.
class AppListControllerSearchResultsBrowserTest
@@ -273,6 +277,8 @@ class AppListControllerSearchResultsBrowserTest
};
// Test showing search results, and uninstalling one of them while displayed.
+// TODO(mgiuca): Enable on Linux when supported.
+#if !defined(OS_LINUX)
IN_PROC_BROWSER_TEST_F(AppListControllerSearchResultsBrowserTest,
UninstallSearchResult) {
base::FilePath test_extension_path;
@@ -318,5 +324,6 @@ IN_PROC_BROWSER_TEST_F(AppListControllerSearchResultsBrowserTest,
StopWatchingResults();
service->DismissAppList();
}
+#endif // !defined(OS_LINUX)
} // namespace
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/ui/app_list/app_list_service_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698