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/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
10 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 10 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 | 89 |
90 // Browser Test for AppListController that ensures the App Info dialog opens | 90 // Browser Test for AppListController that ensures the App Info dialog opens |
91 // correctly. | 91 // correctly. |
92 class AppListControllerAppInfoDialogBrowserTest : public ExtensionBrowserTest { | 92 class AppListControllerAppInfoDialogBrowserTest : public ExtensionBrowserTest { |
93 public: | 93 public: |
94 AppListControllerAppInfoDialogBrowserTest() {} | 94 AppListControllerAppInfoDialogBrowserTest() {} |
95 virtual ~AppListControllerAppInfoDialogBrowserTest() {} | 95 virtual ~AppListControllerAppInfoDialogBrowserTest() {} |
96 | 96 |
97 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { | 97 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { |
98 ExtensionBrowserTest::SetUpCommandLine(command_line); | 98 ExtensionBrowserTest::SetUpCommandLine(command_line); |
99 command_line->AppendSwitch(app_list::switches::kEnableAppInfo); | |
100 } | 99 } |
101 | 100 |
102 private: | 101 private: |
103 DISALLOW_COPY_AND_ASSIGN(AppListControllerAppInfoDialogBrowserTest); | 102 DISALLOW_COPY_AND_ASSIGN(AppListControllerAppInfoDialogBrowserTest); |
104 }; | 103 }; |
105 | 104 |
106 // Test the DoShowAppInfoFlow function of the controller delegate. | 105 // Test the DoShowAppInfoFlow function of the controller delegate. |
107 IN_PROC_BROWSER_TEST_F(AppListControllerAppInfoDialogBrowserTest, | 106 IN_PROC_BROWSER_TEST_F(AppListControllerAppInfoDialogBrowserTest, |
108 DoShowAppInfoFlow) { | 107 DoShowAppInfoFlow) { |
109 // Install an extension to open the dialog for. | 108 // Install an extension to open the dialog for. |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 // Close the app info dialog. | 148 // Close the app info dialog. |
150 views::Widget* app_info_dialog = *owned_widgets.begin(); | 149 views::Widget* app_info_dialog = *owned_widgets.begin(); |
151 app_info_dialog->Close(); | 150 app_info_dialog->Close(); |
152 base::RunLoop().RunUntilIdle(); | 151 base::RunLoop().RunUntilIdle(); |
153 | 152 |
154 owned_widgets.clear(); | 153 owned_widgets.clear(); |
155 widget->GetAllOwnedWidgets(window, &owned_widgets); | 154 widget->GetAllOwnedWidgets(window, &owned_widgets); |
156 EXPECT_EQ(0U, owned_widgets.size()); | 155 EXPECT_EQ(0U, owned_widgets.size()); |
157 EXPECT_FALSE(test_api.is_overlay_visible()); | 156 EXPECT_FALSE(test_api.is_overlay_visible()); |
158 } | 157 } |
OLD | NEW |