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

Side by Side Diff: ash/display/display_manager_unittest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/event_transformation_handler.h » ('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 #include "ash/display/display_manager.h" 5 #include "ash/display/display_manager.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/display_layout_store.h" 8 #include "ash/display/display_layout_store.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
12 #include "ash/test/display_manager_test_api.h" 12 #include "ash/test/display_manager_test_api.h"
13 #include "ash/test/mirror_window_test_api.h" 13 #include "ash/test/mirror_window_test_api.h"
14 #include "base/format_macros.h" 14 #include "base/format_macros.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "ui/aura/env.h" 17 #include "ui/aura/env.h"
18 #include "ui/aura/test/event_generator.h" 18 #include "ui/aura/test/event_generator.h"
19 #include "ui/aura/window_observer.h" 19 #include "ui/aura/window_observer.h"
20 #include "ui/aura/window_tree_host.h" 20 #include "ui/aura/window_tree_host.h"
21 #include "ui/gfx/display_observer.h" 21 #include "ui/gfx/display_observer.h"
22 #include "ui/gfx/display.h" 22 #include "ui/gfx/display.h"
23 #include "ui/gfx/screen.h" 23 #include "ui/gfx/screen.h"
24 #include "ui/gfx/screen_type_delegate.h" 24 #include "ui/gfx/screen_type_delegate.h"
25 25
26 namespace ash { 26 namespace ash {
27 namespace internal {
28 27
29 using std::vector; 28 using std::vector;
30 using std::string; 29 using std::string;
31 30
32 using base::StringPrintf; 31 using base::StringPrintf;
33 32
34 namespace { 33 namespace {
35 34
36 std::string ToDisplayName(int64 id) { 35 std::string ToDisplayName(int64 id) {
37 return "x-" + base::Int64ToString(id); 36 return "x-" + base::Int64ToString(id);
(...skipping 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1223 private: 1222 private:
1224 DISALLOW_COPY_AND_ASSIGN(ScreenShutdownTest); 1223 DISALLOW_COPY_AND_ASSIGN(ScreenShutdownTest);
1225 }; 1224 };
1226 1225
1227 TEST_F(ScreenShutdownTest, ScreenAfterShutdown) { 1226 TEST_F(ScreenShutdownTest, ScreenAfterShutdown) {
1228 if (!SupportsMultipleDisplays()) 1227 if (!SupportsMultipleDisplays())
1229 return; 1228 return;
1230 UpdateDisplay("500x300,800x400"); 1229 UpdateDisplay("500x300,800x400");
1231 } 1230 }
1232 1231
1233 } // namespace internal
1234 } // namespace ash 1232 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/event_transformation_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698