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

Side by Side Diff: ash/test/ash_test_base.h

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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/ash_interactive_ui_test_base.h ('k') | ash/test/ash_test_base.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 (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 #ifndef ASH_TEST_ASH_TEST_BASE_H_ 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_
6 #define ASH_TEST_ASH_TEST_BASE_H_ 6 #define ASH_TEST_ASH_TEST_BASE_H_
7 7
8 #include <stdint.h>
9
8 #include <string> 10 #include <string>
9 11
10 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h"
11 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
12 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
13 #include "content/public/test/test_browser_thread_bundle.h" 16 #include "content/public/test/test_browser_thread_bundle.h"
14 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
15 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
16 #include "ui/gfx/display.h" 19 #include "ui/gfx/display.h"
17 #include "ui/wm/public/window_types.h" 20 #include "ui/wm/public/window_types.h"
18 21
19 #if defined(OS_WIN) 22 #if defined(OS_WIN)
20 #include "ui/base/win/scoped_ole_initializer.h" 23 #include "ui/base/win/scoped_ole_initializer.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 protected: 97 protected:
95 enum UserSessionBlockReason { 98 enum UserSessionBlockReason {
96 FIRST_BLOCK_REASON, 99 FIRST_BLOCK_REASON,
97 BLOCKED_BY_LOCK_SCREEN = FIRST_BLOCK_REASON, 100 BLOCKED_BY_LOCK_SCREEN = FIRST_BLOCK_REASON,
98 BLOCKED_BY_LOGIN_SCREEN, 101 BLOCKED_BY_LOGIN_SCREEN,
99 BLOCKED_BY_USER_ADDING_SCREEN, 102 BLOCKED_BY_USER_ADDING_SCREEN,
100 NUMBER_OF_BLOCK_REASONS 103 NUMBER_OF_BLOCK_REASONS
101 }; 104 };
102 105
103 // Returns the rotation currentl active for the display |id|. 106 // Returns the rotation currentl active for the display |id|.
104 static gfx::Display::Rotation GetActiveDisplayRotation(int64 id); 107 static gfx::Display::Rotation GetActiveDisplayRotation(int64_t id);
105 108
106 // Returns the rotation currently active for the internal display. 109 // Returns the rotation currently active for the internal display.
107 static gfx::Display::Rotation GetCurrentInternalDisplayRotation(); 110 static gfx::Display::Rotation GetCurrentInternalDisplayRotation();
108 111
109 // Proxy to AshTestHelper::SupportsMultipleDisplays(). 112 // Proxy to AshTestHelper::SupportsMultipleDisplays().
110 static bool SupportsMultipleDisplays(); 113 static bool SupportsMultipleDisplays();
111 114
112 // Proxy to AshTestHelper::SupportsHostWindowResize(). 115 // Proxy to AshTestHelper::SupportsHostWindowResize().
113 static bool SupportsHostWindowResize(); 116 static bool SupportsHostWindowResize();
114 117
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 ~NoSessionAshTestBase() override {} 166 ~NoSessionAshTestBase() override {}
164 167
165 private: 168 private:
166 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 169 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
167 }; 170 };
168 171
169 } // namespace test 172 } // namespace test
170 } // namespace ash 173 } // namespace ash
171 174
172 #endif // ASH_TEST_ASH_TEST_BASE_H_ 175 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/test/ash_interactive_ui_test_base.h ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698