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" | 9 #include "ash/display/display_manager.h" |
10 #include "ash/display/window_tree_host_manager.h" | 10 #include "ash/display/window_tree_host_manager.h" |
(...skipping 13 matching lines...) Expand all Loading... |
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 |
31 } | 31 } |
32 | 32 |
33 DisplayOverscanHandler::DisplayOverscanHandler() { | 33 DisplayOverscanHandler::DisplayOverscanHandler() { |
34 ash::Shell::GetScreen()->AddObserver(this); | 34 gfx::Screen::GetScreen()->AddObserver(this); |
35 } | 35 } |
36 | 36 |
37 DisplayOverscanHandler::~DisplayOverscanHandler() { | 37 DisplayOverscanHandler::~DisplayOverscanHandler() { |
38 ash::Shell::GetScreen()->RemoveObserver(this); | 38 gfx::Screen::GetScreen()->RemoveObserver(this); |
39 } | 39 } |
40 | 40 |
41 void DisplayOverscanHandler::GetLocalizedValues( | 41 void DisplayOverscanHandler::GetLocalizedValues( |
42 base::DictionaryValue* localized_strings) { | 42 base::DictionaryValue* localized_strings) { |
43 RegisterTitle(localized_strings, "displayOverscanPage", | 43 RegisterTitle(localized_strings, "displayOverscanPage", |
44 IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_TAB_TITLE); | 44 IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_TAB_TITLE); |
45 localized_strings->SetString("shrinkAndExpand", l10n_util::GetStringUTF16( | 45 localized_strings->SetString("shrinkAndExpand", l10n_util::GetStringUTF16( |
46 IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_SHRINK_EXPAND)); | 46 IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_SHRINK_EXPAND)); |
47 localized_strings->SetString("move", l10n_util::GetStringUTF16( | 47 localized_strings->SetString("move", l10n_util::GetStringUTF16( |
48 IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_MOVE)); | 48 IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_MOVE)); |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 LOG(ERROR) << "The orientation must be '" << kOrientationHorizontal | 200 LOG(ERROR) << "The orientation must be '" << kOrientationHorizontal |
201 << "' or '" << kOrientationVertical << "': " | 201 << "' or '" << kOrientationVertical << "': " |
202 << orientation; | 202 << orientation; |
203 return; | 203 return; |
204 } | 204 } |
205 overscan_calibrator_->UpdateInsets(insets); | 205 overscan_calibrator_->UpdateInsets(insets); |
206 } | 206 } |
207 | 207 |
208 } // namespace options | 208 } // namespace options |
209 } // namespace chromeos | 209 } // namespace chromeos |
OLD | NEW |