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

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 app_list_controller_browsertest tests on Linux. 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
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..27923cb725ebfdd9545a0c67feb05c332d297882 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
tapted 2013/09/27 06:25:56 nit: ` // !defined(OS_LINUX)`
Matt Giuca 2013/09/27 10:29:41 Done.
-#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();

Powered by Google App Engine
This is Rietveld 408576698