| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/common/test/test_system_tray_delegate.h" | 5 #include "ash/test/test_system_tray_delegate.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "ash/common/login_status.h" | 9 #include "ash/login_status.h" |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/session/session_state_delegate.h" |
| 11 #include "ash/common/wm_shell.h" | 11 #include "ash/wm_shell.h" |
| 12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 namespace test { | 15 namespace test { |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 LoginStatus g_initial_status = LoginStatus::USER; | 19 LoginStatus g_initial_status = LoginStatus::USER; |
| 20 | 20 |
| 21 } // namespace | 21 } // namespace |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 : old_status_(g_initial_status) { | 100 : old_status_(g_initial_status) { |
| 101 g_initial_status = new_status; | 101 g_initial_status = new_status; |
| 102 } | 102 } |
| 103 | 103 |
| 104 ScopedInitialLoginStatus::~ScopedInitialLoginStatus() { | 104 ScopedInitialLoginStatus::~ScopedInitialLoginStatus() { |
| 105 g_initial_status = old_status_; | 105 g_initial_status = old_status_; |
| 106 } | 106 } |
| 107 | 107 |
| 108 } // namespace test | 108 } // namespace test |
| 109 } // namespace ash | 109 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2736573002:
chromeos: Move files in //ash/common to //ash, part 2 (Closed)
