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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback 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 unified diff | Download patch
OLDNEW
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/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/login_status.h" 9 #include "ash/login_status.h"
10 #include "ash/session/session_controller.h" 10 #include "ash/session/session_controller.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/wm_shell.h"
13 #include "base/time/time.h" 12 #include "base/time/time.h"
14 13
15 namespace ash { 14 namespace ash {
16 namespace test { 15 namespace test {
17 16
18 namespace { 17 namespace {
19 18
20 LoginStatus g_initial_status = LoginStatus::USER; 19 LoginStatus g_initial_status = LoginStatus::USER;
21 20
22 } // namespace 21 } // namespace
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 : old_status_(g_initial_status) { 100 : old_status_(g_initial_status) {
102 g_initial_status = new_status; 101 g_initial_status = new_status;
103 } 102 }
104 103
105 ScopedInitialLoginStatus::~ScopedInitialLoginStatus() { 104 ScopedInitialLoginStatus::~ScopedInitialLoginStatus() {
106 g_initial_status = old_status_; 105 g_initial_status = old_status_;
107 } 106 }
108 107
109 } // namespace test 108 } // namespace test
110 } // namespace ash 109 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698