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

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 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
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 "ash/common/session/session_state_delegate.h"
7 #include "ash/display/display_configuration_controller.h" 8 #include "ash/display/display_configuration_controller.h"
8 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shelf/shelf_delegate.h" 10 #include "ash/shelf/shelf_delegate.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_delegate.h" 12 #include "ash/shell_delegate.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace test { 15 namespace test {
16 16
17 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 17 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
18 18
19 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { 19 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 shell_->shelf_delegate_.reset(delegate); 52 shell_->shelf_delegate_.reset(delegate);
53 } 53 }
54 54
55 void ShellTestApi::SetSessionStateDelegate( 55 void ShellTestApi::SetSessionStateDelegate(
56 SessionStateDelegate* session_state_delegate) { 56 SessionStateDelegate* session_state_delegate) {
57 shell_->session_state_delegate_.reset(session_state_delegate); 57 shell_->session_state_delegate_.reset(session_state_delegate);
58 } 58 }
59 59
60 } // namespace test 60 } // namespace test
61 } // namespace ash 61 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698