| 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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ |
| 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> |
| 11 |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "chrome/browser/ui/webui/options/options_ui.h" | 13 #include "chrome/browser/ui/webui/options/options_ui.h" |
| 13 #include "ui/gfx/display_observer.h" | 14 #include "ui/gfx/display_observer.h" |
| 14 | 15 |
| 15 namespace base { | 16 namespace base { |
| 16 class DictionaryValue; | 17 class DictionaryValue; |
| 17 class ListValue; | 18 class ListValue; |
| 18 } | 19 } |
| 19 | 20 |
| 20 namespace chromeos { | 21 namespace chromeos { |
| 21 class OverscanCalibrator; | 22 class OverscanCalibrator; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 43 | 44 |
| 44 private: | 45 private: |
| 45 // Handlers of JS messages. | 46 // Handlers of JS messages. |
| 46 void HandleStart(const base::ListValue* args); | 47 void HandleStart(const base::ListValue* args); |
| 47 void HandleCommit(const base::ListValue* unused_args); | 48 void HandleCommit(const base::ListValue* unused_args); |
| 48 void HandleReset(const base::ListValue* unused_args); | 49 void HandleReset(const base::ListValue* unused_args); |
| 49 void HandleCancel(const base::ListValue* unused_args); | 50 void HandleCancel(const base::ListValue* unused_args); |
| 50 void HandleMove(const base::ListValue* args); | 51 void HandleMove(const base::ListValue* args); |
| 51 void HandleResize(const base::ListValue* args); | 52 void HandleResize(const base::ListValue* args); |
| 52 | 53 |
| 53 scoped_ptr<OverscanCalibrator> overscan_calibrator_; | 54 std::unique_ptr<OverscanCalibrator> overscan_calibrator_; |
| 54 | 55 |
| 55 DISALLOW_COPY_AND_ASSIGN(DisplayOverscanHandler); | 56 DISALLOW_COPY_AND_ASSIGN(DisplayOverscanHandler); |
| 56 }; | 57 }; |
| 57 | 58 |
| 58 } // namespace options | 59 } // namespace options |
| 59 } // namespace chromeos | 60 } // namespace chromeos |
| 60 | 61 |
| 61 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ | 62 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ |
| OLD | NEW |