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

Side by Side Diff: chrome/browser/apps/custom_launcher_page_browsertest_views.cc

Issue 2342773002: Removed experimental app list flags. Experimental is now the only way. (Closed)
Patch Set: Rebase on CL 2341113003. Created 4 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
OLDNEW
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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // app inside the launcher, not as a standalone background page. 49 // app inside the launcher, not as a standalone background page.
50 // the app launcher. 50 // the app launcher.
51 class CustomLauncherPageBrowserTest 51 class CustomLauncherPageBrowserTest
52 : public extensions::PlatformAppBrowserTest { 52 : public extensions::PlatformAppBrowserTest {
53 public: 53 public:
54 CustomLauncherPageBrowserTest() {} 54 CustomLauncherPageBrowserTest() {}
55 55
56 void SetUpCommandLine(base::CommandLine* command_line) override { 56 void SetUpCommandLine(base::CommandLine* command_line) override {
57 PlatformAppBrowserTest::SetUpCommandLine(command_line); 57 PlatformAppBrowserTest::SetUpCommandLine(command_line);
58 58
59 // Custom launcher pages only work in the experimental app list.
60 command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
61
62 // Ensure the app list does not close during the test. 59 // Ensure the app list does not close during the test.
63 command_line->AppendSwitch( 60 command_line->AppendSwitch(
64 app_list::switches::kDisableAppListDismissOnBlur); 61 app_list::switches::kDisableAppListDismissOnBlur);
65 62
66 // The test app must be whitelisted to use launcher_page. 63 // The test app must be whitelisted to use launcher_page.
67 command_line->AppendSwitchASCII( 64 command_line->AppendSwitchASCII(
68 extensions::switches::kWhitelistedExtensionID, kCustomLauncherPageID); 65 extensions::switches::kWhitelistedExtensionID, kCustomLauncherPageID);
69 } 66 }
70 67
71 // Open the launcher. Ignores the Extension argument (this will simply 68 // Open the launcher. Ignores the Extension argument (this will simply
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 // And in reverse. 457 // And in reverse.
461 EXPECT_EQ( 458 EXPECT_EQ(
462 search_box_textfield, 459 search_box_textfield,
463 app_list_view->GetFocusManager()->GetNextFocusableView( 460 app_list_view->GetFocusManager()->GetNextFocusableView(
464 custom_page_webview, custom_page_webview->GetWidget(), true, false)); 461 custom_page_webview, custom_page_webview->GetWidget(), true, false));
465 EXPECT_EQ(custom_page_webview, 462 EXPECT_EQ(custom_page_webview,
466 app_list_view->GetFocusManager()->GetNextFocusableView( 463 app_list_view->GetFocusManager()->GetNextFocusableView(
467 search_box_textfield, search_box_textfield->GetWidget(), true, 464 search_box_textfield, search_box_textfield->GetWidget(), true,
468 false)); 465 false));
469 } 466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698