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

Unified Diff: chrome/browser/apps/custom_launcher_page_browsertest_views.cc

Issue 1866403006: Revert of AppListController refactoring part 3: Switching over to use AppListShower in Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_ash_impl
Patch Set: Created 4 years, 8 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 | « ash/wm/app_list_controller_unittest.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/custom_launcher_page_browsertest_views.cc
diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
index 9cbd71dde6990e742b1cab4b2c45609fcb0dce23..c1b406975276177fab8e6380013af0cc5f5a9083 100644
--- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
+++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
@@ -4,6 +4,7 @@
#include <string>
+#include "ash/shell.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
@@ -23,16 +24,10 @@
#include "ui/app_list/views/contents_view.h"
#include "ui/app_list/views/custom_launcher_page_view.h"
#include "ui/app_list/views/search_box_view.h"
-#include "ui/aura/window.h"
#include "ui/events/test/event_generator.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/controls/webview/webview.h"
#include "ui/views/focus/focus_manager.h"
-
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/ash/app_list/test/app_list_service_ash_test_api.h"
-#include "ui/app_list/shower/app_list_shower_impl.h"
-#endif
namespace {
@@ -79,9 +74,9 @@
app_list::AppListView* GetAppListView() {
app_list::AppListView* app_list_view = nullptr;
#if defined(OS_CHROMEOS)
- AppListServiceAshTestApi service_test;
- app_list_view = service_test.GetAppListView();
- EXPECT_TRUE(service_test.GetAppListShower()->GetTargetVisibility());
+ ash::Shell* shell = ash::Shell::GetInstance();
+ app_list_view = shell->GetAppListView();
+ EXPECT_TRUE(shell->GetAppListTargetVisibility());
#else
AppListServiceViews* service =
static_cast<AppListServiceViews*>(AppListService::Get());
« no previous file with comments | « ash/wm/app_list_controller_unittest.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698