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

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

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: add test Created 3 years, 6 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
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_session_state_delegate.h » ('j') | 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/shell_test_api.h" 5 #include "ash/test/shell_test_api.h"
6 6
7 #include <utility>
8
7 #include "ash/palette_delegate.h" 9 #include "ash/palette_delegate.h"
8 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shell.h" 11 #include "ash/shell.h"
11 12
12 namespace ash { 13 namespace ash {
13 namespace test { 14 namespace test {
14 15
15 ShellTestApi::ShellTestApi() : ShellTestApi(Shell::Get()) {} 16 ShellTestApi::ShellTestApi() : ShellTestApi(Shell::Get()) {}
16 17
17 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 18 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
18 19
19 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { 20 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
(...skipping 14 matching lines...) Expand all
34 35
35 DragDropController* ShellTestApi::drag_drop_controller() { 36 DragDropController* ShellTestApi::drag_drop_controller() {
36 return shell_->drag_drop_controller_.get(); 37 return shell_->drag_drop_controller_.get();
37 } 38 }
38 39
39 void ShellTestApi::SetPaletteDelegate( 40 void ShellTestApi::SetPaletteDelegate(
40 std::unique_ptr<PaletteDelegate> palette_delegate) { 41 std::unique_ptr<PaletteDelegate> palette_delegate) {
41 shell_->palette_delegate_ = std::move(palette_delegate); 42 shell_->palette_delegate_ = std::move(palette_delegate);
42 } 43 }
43 44
44 void ShellTestApi::SetSessionStateDelegate(
45 SessionStateDelegate* session_state_delegate) {
46 shell_->session_state_delegate_.reset(session_state_delegate);
47 }
48
49 } // namespace test 45 } // namespace test
50 } // namespace ash 46 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698