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

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

Issue 1150913002: Save and restore unified mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 (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_DISPLAY_MANAGER_TEST_API_H_ 5 #ifndef ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
6 #define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ 6 #define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 15 matching lines...) Expand all
26 26
27 namespace test { 27 namespace test {
28 28
29 class DisplayManagerTestApi { 29 class DisplayManagerTestApi {
30 public: 30 public:
31 // Test if moving a mouse to |point_in_screen| warps it to another 31 // Test if moving a mouse to |point_in_screen| warps it to another
32 // display. 32 // display.
33 static bool TestIfMouseWarpsAt(ui::test::EventGenerator& event_generator, 33 static bool TestIfMouseWarpsAt(ui::test::EventGenerator& event_generator,
34 const gfx::Point& point_in_screen); 34 const gfx::Point& point_in_screen);
35 35
36 static void EnableUnifiedDesktopForTest();
37
36 explicit DisplayManagerTestApi(DisplayManager* display_manager); 38 explicit DisplayManagerTestApi(DisplayManager* display_manager);
37 virtual ~DisplayManagerTestApi(); 39 virtual ~DisplayManagerTestApi();
38 40
39 // Update the display configuration as given in |display_specs|. The format of 41 // Update the display configuration as given in |display_specs|. The format of
40 // |display_spec| is a list of comma separated spec for each displays. Please 42 // |display_spec| is a list of comma separated spec for each displays. Please
41 // refer to the comment in |ash::DisplayInfo::CreateFromSpec| for the format 43 // refer to the comment in |ash::DisplayInfo::CreateFromSpec| for the format
42 // of the display spec. 44 // of the display spec.
43 void UpdateDisplay(const std::string& display_specs); 45 void UpdateDisplay(const std::string& display_specs);
44 46
45 // Set the 1st display as an internal display and returns the display Id for 47 // Set the 1st display as an internal display and returns the display Id for
(...skipping 15 matching lines...) Expand all
61 private: 63 private:
62 DisplayManager* display_manager_; // not owned 64 DisplayManager* display_manager_; // not owned
63 65
64 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi); 66 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi);
65 }; 67 };
66 68
67 } // namespace test 69 } // namespace test
68 } // namespace ash 70 } // namespace ash
69 71
70 #endif // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ 72 #endif // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698