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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 2688353005: Fix shelf alignment and auto-hide initialization. (Closed)
Patch Set: Fix mash_unittests by installing a TestShellDelegate. Created 3 years, 10 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 unified diff | Download patch
« ash/mus/window_manager.h ('K') | « ash/shell/shell_delegate_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/common/default_accessibility_delegate.h" 9 #include "ash/common/default_accessibility_delegate.h"
10 #include "ash/common/gpu_support_stub.h" 10 #include "ash/common/gpu_support_stub.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 num_exit_requests_++; 68 num_exit_requests_++;
69 } 69 }
70 70
71 keyboard::KeyboardUI* TestShellDelegate::CreateKeyboardUI() { 71 keyboard::KeyboardUI* TestShellDelegate::CreateKeyboardUI() {
72 return new TestKeyboardUI; 72 return new TestKeyboardUI;
73 } 73 }
74 74
75 void TestShellDelegate::OpenUrlFromArc(const GURL& url) {} 75 void TestShellDelegate::OpenUrlFromArc(const GURL& url) {}
76 76
77 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { 77 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) {
78 return new TestShelfDelegate(model); 78 return new TestShelfDelegate();
79 } 79 }
80 80
81 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { 81 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
82 return new TestSystemTrayDelegate; 82 return new TestSystemTrayDelegate;
83 } 83 }
84 84
85 std::unique_ptr<WallpaperDelegate> 85 std::unique_ptr<WallpaperDelegate>
86 TestShellDelegate::CreateWallpaperDelegate() { 86 TestShellDelegate::CreateWallpaperDelegate() {
87 return base::MakeUnique<TestWallpaperDelegate>(); 87 return base::MakeUnique<TestWallpaperDelegate>();
88 } 88 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled, 125 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
126 bool use_local_state) { 126 bool use_local_state) {
127 if (use_local_state) 127 if (use_local_state)
128 touchscreen_enabled_in_local_pref_ = enabled; 128 touchscreen_enabled_in_local_pref_ = enabled;
129 } 129 }
130 130
131 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {} 131 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
132 132
133 } // namespace test 133 } // namespace test
134 } // namespace ash 134 } // namespace ash
OLDNEW
« ash/mus/window_manager.h ('K') | « ash/shell/shell_delegate_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698