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

Side by Side Diff: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

Issue 2118643002: Move MaximizeModeController into ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: doh Created 4 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/api/system_display/display_info_provider.h" 5 #include "extensions/browser/api/system_display/display_info_provider.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "ash/common/ash_switches.h" 9 #include "ash/common/ash_switches.h"
10 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
10 #include "ash/display/display_manager.h" 11 #include "ash/display/display_manager.h"
11 #include "ash/display/screen_orientation_controller_chromeos.h" 12 #include "ash/display/screen_orientation_controller_chromeos.h"
12 #include "ash/screen_util.h" 13 #include "ash/screen_util.h"
13 #include "ash/shell.h" 14 #include "ash/shell.h"
14 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
15 #include "ash/test/display_manager_test_api.h" 16 #include "ash/test/display_manager_test_api.h"
16 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "extensions/common/api/system_display.h" 21 #include "extensions/common/api/system_display.h"
22 #include "ui/display/display.h" 22 #include "ui/display/display.h"
23 #include "ui/display/manager/display_layout.h" 23 #include "ui/display/manager/display_layout.h"
24 #include "ui/gfx/geometry/rect.h" 24 #include "ui/gfx/geometry/rect.h"
25 25
26 namespace extensions { 26 namespace extensions {
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 CallSetDisplayUnitInfo(base::Int64ToString(id), info, &success, &error); 1183 CallSetDisplayUnitInfo(base::Int64ToString(id), info, &success, &error);
1184 ASSERT_TRUE(success); 1184 ASSERT_TRUE(success);
1185 1185
1186 // Verify that other_mode now matches the active mode. 1186 // Verify that other_mode now matches the active mode.
1187 active_mode = GetDisplayManager()->GetActiveModeForDisplayId(id); 1187 active_mode = GetDisplayManager()->GetActiveModeForDisplayId(id);
1188 EXPECT_TRUE(active_mode.IsEquivalent(other_mode_ash)); 1188 EXPECT_TRUE(active_mode.IsEquivalent(other_mode_ash));
1189 } 1189 }
1190 1190
1191 } // namespace 1191 } // namespace
1192 } // namespace extensions 1192 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698