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

Unified Diff: ash/test/test_shell_delegate.h

Issue 1861013004: 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: Addressing review feedback. 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
Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index c27879dd3be8ca2af081a8dc37fe8bbac0e8a84b..e43cef6be9ad537b43740152eb84f50797e7b431 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -5,6 +5,7 @@
#ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
#define ASH_TEST_TEST_SHELL_DELEGATE_H_
+#include <memory>
#include <string>
sky 2016/04/07 21:43:28 include <utility>
mfomitchev 2016/04/08 15:50:44 I believe unique_ptr is in <memory>: http://en.cpp
#include "ash/media_delegate.h"
@@ -12,9 +13,13 @@
#include "ash/test/test_session_state_delegate.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
+namespace app_list {
+class AppListShowerDelegateFactory;
+class AppListShowerImpl;
+}
+
namespace keyboard {
class KeyboardUI;
}
@@ -48,7 +53,7 @@ class TestShellDelegate : public ShellDelegate {
void RemoveVirtualKeyboardStateObserver(
VirtualKeyboardStateObserver* observer) override;
void OpenUrl(const GURL& url) override;
- app_list::AppListViewDelegate* GetAppListViewDelegate() override;
+ app_list::AppListShower* GetAppListShower() override;
ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
SystemTrayDelegate* CreateSystemTrayDelegate() override;
UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
@@ -64,6 +69,10 @@ class TestShellDelegate : public ShellDelegate {
int num_exit_requests() const { return num_exit_requests_; }
+ app_list::AppListShowerImpl* app_list_shower() {
+ return app_list_shower_.get();
+ }
+
void SetMediaCaptureState(MediaCaptureState state);
void SetForceMaximizeOnFirstRun(bool maximize) {
force_maximize_on_first_run_ = maximize;
@@ -74,7 +83,9 @@ class TestShellDelegate : public ShellDelegate {
bool multi_profiles_enabled_;
bool force_maximize_on_first_run_;
- scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
+ std::unique_ptr<app_list::AppListShowerDelegateFactory>
+ app_list_shower_delegate_factory_;
+ std::unique_ptr<app_list::AppListShowerImpl> app_list_shower_;
base::ObserverList<ash::VirtualKeyboardStateObserver>
keyboard_state_observer_list_;

Powered by Google App Engine
This is Rietveld 408576698