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

Unified Diff: ash/test/test_shell_delegate.h

Issue 2827193004: Make PrefService available in *ash (Closed)
Patch Set: Adding NOTREACHED() comment. Created 3 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/BUILD.gn ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 9110cda806fce3f3b0dc6f3e30e02f91184ce8ca..27f61aa0fd0fbe0faf5daee00d428966d31f0aeb 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -12,6 +12,8 @@
#include "ash/test/test_session_state_delegate.h"
#include "base/macros.h"
+class TestingPrefServiceSimple;
+
namespace keyboard {
class KeyboardUI;
}
@@ -54,7 +56,7 @@ class TestShellDelegate : public ShellDelegate {
GPUSupport* CreateGPUSupport() override;
base::string16 GetProductName() const override;
gfx::Image GetDeprecatedAcceleratorImage() const override;
-
+ PrefService* GetActiveUserPrefService() const override;
bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
void SetTouchscreenEnabledInPrefs(bool enabled,
bool use_local_state) override;
@@ -72,6 +74,7 @@ class TestShellDelegate : public ShellDelegate {
bool force_maximize_on_first_run_;
bool touchscreen_enabled_in_local_pref_;
std::unique_ptr<ShelfInitializer> shelf_initializer_;
+ std::unique_ptr<TestingPrefServiceSimple> pref_service_;
DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
};
« no previous file with comments | « ash/test/BUILD.gn ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698