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

Side by Side Diff: chrome/browser/chromeos/display/overscan_calibrator.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 CHROME_BROWSER_CHROMEOS_DISPLAY_OVERSCAN_CALIBRATOR_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_DISPLAY_OVERSCAN_CALIBRATOR_H_
6 #define CHROME_BROWSER_CHROMEOS_DISPLAY_OVERSCAN_CALIBRATOR_H_ 6 #define CHROME_BROWSER_CHROMEOS_DISPLAY_OVERSCAN_CALIBRATOR_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/compositor/layer_delegate.h" 11 #include "ui/compositor/layer_delegate.h"
11 #include "ui/gfx/display.h" 12 #include "ui/gfx/display.h"
12 #include "ui/gfx/geometry/insets.h" 13 #include "ui/gfx/geometry/insets.h"
13 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
14 15
15 namespace ui { 16 namespace ui {
16 class Layer; 17 class Layer;
17 } 18 }
18 19
19 namespace chromeos { 20 namespace chromeos {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // The current insets. 53 // The current insets.
53 gfx::Insets insets_; 54 gfx::Insets insets_;
54 55
55 // The insets initially given. Stored so we can undo the insets later. 56 // The insets initially given. Stored so we can undo the insets later.
56 gfx::Insets initial_insets_; 57 gfx::Insets initial_insets_;
57 58
58 // Whether the current insets are committed to the system or not. 59 // Whether the current insets are committed to the system or not.
59 bool committed_; 60 bool committed_;
60 61
61 // The visualization layer for the current calibration region. 62 // The visualization layer for the current calibration region.
62 scoped_ptr<ui::Layer> calibration_layer_; 63 std::unique_ptr<ui::Layer> calibration_layer_;
63 64
64 DISALLOW_COPY_AND_ASSIGN(OverscanCalibrator); 65 DISALLOW_COPY_AND_ASSIGN(OverscanCalibrator);
65 }; 66 };
66 67
67 } // namespace chromeos 68 } // namespace chromeos
68 69
69 #endif // CHROME_BROWSER_CHROMEOS_DISPLAY_OVERSCAN_CALIBRATOR_H_ 70 #endif // CHROME_BROWSER_CHROMEOS_DISPLAY_OVERSCAN_CALIBRATOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/display/display_preferences_unittest.cc ('k') | chrome/browser/chromeos/display/quirks_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698