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

Unified Diff: ash/test/shell_test_api.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/shell_test_api.h ('k') | ash/test/test_wallpaper_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/shell_test_api.cc
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index 8c8293c4f9eb088522a151751330807de86fbe76..4f5435751cf389208665d1ef295710b635dafeb0 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "ash/test/shell_test_api.h"
-
+#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/display/display_configuration_controller.h"
#include "ash/root_window_controller.h"
@@ -12,6 +12,8 @@
namespace ash {
namespace test {
+ShellTestApi::ShellTestApi() : ShellTestApi(Shell::GetInstance()) {}
+
ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
@@ -38,6 +40,11 @@ void ShellTestApi::DisableDisplayAnimator() {
shell_->display_configuration_controller()->ResetAnimatorForTest();
}
+void ShellTestApi::SetPaletteDelegate(
+ std::unique_ptr<PaletteDelegate> palette_delegate) {
+ shell_->palette_delegate_ = std::move(palette_delegate);
+}
+
void ShellTestApi::SetSessionStateDelegate(
SessionStateDelegate* session_state_delegate) {
shell_->session_state_delegate_.reset(session_state_delegate);
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_wallpaper_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698