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

Side by Side Diff: ash/common/test/test_system_tray_delegate.h

Issue 2384103003: Fix spacing issues on Ash shelf (Closed)
Patch Set: Skipped failing tests on Windows Created 4 years, 1 month 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/common/shelf/shelf_view.cc ('k') | ash/common/test/test_system_tray_delegate.cc » ('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 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 #ifndef ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include "ash/common/system/tray/default_system_tray_delegate.h" 8 #include "ash/common/system/tray/default_system_tray_delegate.h"
9 #include "ash/common/system/tray/ime_info.h" 9 #include "ash/common/system/tray/ime_info.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace test { 14 namespace test {
15 15
16 class TestSystemTrayDelegate : public DefaultSystemTrayDelegate { 16 class TestSystemTrayDelegate : public DefaultSystemTrayDelegate {
17 public: 17 public:
18 TestSystemTrayDelegate(); 18 TestSystemTrayDelegate();
19 ~TestSystemTrayDelegate() override; 19 ~TestSystemTrayDelegate() override;
20 20
21 // Sets whether a system update is required. Defaults to false. Static so
22 // tests can set the value before the system tray is constructed. Reset in
23 // AshTestHelper::TearDown.
24 static void SetSystemUpdateRequired(bool required);
James Cook 2016/11/21 23:27:26 Hooray for getting rid of this!
25
26 // Changes the current login status in the test. This also invokes 21 // Changes the current login status in the test. This also invokes
27 // UpdateAfterLoginStatusChange(). Usually this is called in the test code to 22 // UpdateAfterLoginStatusChange(). Usually this is called in the test code to
28 // set up a login status. This will fit to most of the test cases, but this 23 // set up a login status. This will fit to most of the test cases, but this
29 // cannot be set during the initialization. To test the initialization, 24 // cannot be set during the initialization. To test the initialization,
30 // consider using SetInitialLoginStatus() instead. 25 // consider using SetInitialLoginStatus() instead.
31 void SetLoginStatus(LoginStatus login_status); 26 void SetLoginStatus(LoginStatus login_status);
32 27
33 // Updates the session length limit so that the limit will come from now in 28 // Updates the session length limit so that the limit will come from now in
34 // |new_limit|. 29 // |new_limit|.
35 void SetSessionLengthLimitForTest(const base::TimeDelta& new_limit); 30 void SetSessionLengthLimitForTest(const base::TimeDelta& new_limit);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 private: 68 private:
74 LoginStatus old_status_; 69 LoginStatus old_status_;
75 70
76 DISALLOW_COPY_AND_ASSIGN(ScopedInitialLoginStatus); 71 DISALLOW_COPY_AND_ASSIGN(ScopedInitialLoginStatus);
77 }; 72 };
78 73
79 } // namespace test 74 } // namespace test
80 } // namespace ash 75 } // namespace ash
81 76
82 #endif // ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 77 #endif // ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/test/test_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698