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

Unified Diff: ash/test/test_shell_delegate.cc

Issue 1890583002: Renaming App List Shower to App List Presenter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix. 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/test/test_shell_delegate.h ('k') | build/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index ca44f6ed895b184df9f1bad38f3acfec7ea14946..90100e34d539ad372cc6637ff3aab20f6b1c6018 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -6,8 +6,8 @@
#include <limits>
-#include "ash/app_list/app_list_shower_delegate.h"
-#include "ash/app_list/app_list_shower_delegate_factory.h"
+#include "ash/app_list/app_list_presenter_delegate.h"
+#include "ash/app_list/app_list_presenter_delegate_factory.h"
#include "ash/app_list/app_list_view_delegate_factory.h"
#include "ash/default_accessibility_delegate.h"
#include "ash/gpu_support_stub.h"
@@ -25,7 +25,7 @@
#include "ash/wm/window_util.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
-#include "ui/app_list/shower/app_list_shower_impl.h"
+#include "ui/app_list/presenter/app_list_presenter_impl.h"
#include "ui/app_list/test/app_list_test_view_delegate.h"
#include "ui/aura/window.h"
#include "ui/gfx/image/image.h"
@@ -105,7 +105,7 @@ TestShellDelegate::TestShellDelegate()
: num_exit_requests_(0),
multi_profiles_enabled_(false),
force_maximize_on_first_run_(false),
- app_list_shower_delegate_factory_(new AppListShowerDelegateFactory(
+ app_list_presenter_delegate_factory_(new AppListPresenterDelegateFactory(
base::WrapUnique(new AppListViewDelegateFactoryImpl))) {}
TestShellDelegate::~TestShellDelegate() {
@@ -167,12 +167,12 @@ void TestShellDelegate::RemoveVirtualKeyboardStateObserver(
void TestShellDelegate::OpenUrl(const GURL& url) {}
-app_list::AppListShower* TestShellDelegate::GetAppListShower() {
- if (!app_list_shower_) {
- app_list_shower_.reset(new app_list::AppListShowerImpl(
- app_list_shower_delegate_factory_.get()));
+app_list::AppListPresenter* TestShellDelegate::GetAppListPresenter() {
+ if (!app_list_presenter_) {
+ app_list_presenter_.reset(new app_list::AppListPresenterImpl(
+ app_list_presenter_delegate_factory_.get()));
}
- return app_list_shower_.get();
+ return app_list_presenter_.get();
}
ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) {
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698