OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "ash/display/display_manager.h" | |
10 #include "ash/display/window_tree_host_manager.h" | 9 #include "ash/display/window_tree_host_manager.h" |
11 #include "ash/shell.h" | 10 #include "ash/shell.h" |
12 #include "base/bind.h" | 11 #include "base/bind.h" |
13 #include "base/logging.h" | 12 #include "base/logging.h" |
14 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
15 #include "base/values.h" | 14 #include "base/values.h" |
16 #include "chrome/browser/chromeos/display/overscan_calibrator.h" | 15 #include "chrome/browser/chromeos/display/overscan_calibrator.h" |
17 #include "chrome/grit/generated_resources.h" | 16 #include "chrome/grit/generated_resources.h" |
18 #include "content/public/browser/web_ui.h" | 17 #include "content/public/browser/web_ui.h" |
19 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
20 #include "ui/display/display.h" | 19 #include "ui/display/display.h" |
| 20 #include "ui/display/manager/display_manager.h" |
21 #include "ui/display/screen.h" | 21 #include "ui/display/screen.h" |
22 | 22 |
23 namespace chromeos { | 23 namespace chromeos { |
24 namespace options { | 24 namespace options { |
25 namespace { | 25 namespace { |
26 | 26 |
27 // The value for the orientation of overscan operations. | 27 // The value for the orientation of overscan operations. |
28 const char kOrientationHorizontal[] = "horizontal"; | 28 const char kOrientationHorizontal[] = "horizontal"; |
29 const char kOrientationVertical[] = "vertical"; | 29 const char kOrientationVertical[] = "vertical"; |
30 | 30 |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 LOG(ERROR) << "The orientation must be '" << kOrientationHorizontal | 201 LOG(ERROR) << "The orientation must be '" << kOrientationHorizontal |
202 << "' or '" << kOrientationVertical << "': " | 202 << "' or '" << kOrientationVertical << "': " |
203 << orientation; | 203 << orientation; |
204 return; | 204 return; |
205 } | 205 } |
206 overscan_calibrator_->UpdateInsets(insets); | 206 overscan_calibrator_->UpdateInsets(insets); |
207 } | 207 } |
208 | 208 |
209 } // namespace options | 209 } // namespace options |
210 } // namespace chromeos | 210 } // namespace chromeos |
OLD | NEW |