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

Side by Side Diff: chrome/browser/chromeos/ui/focus_ring_layer.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_CHROMEOS_UI_FOCUS_RING_LAYER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_LAYER_H_
6 #define CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_LAYER_H_ 6 #define CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_LAYER_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/geometry/rect.h" 12 #include "ui/gfx/geometry/rect.h"
12 13
13 namespace aura { 14 namespace aura {
14 class Window; 15 class Window;
15 } 16 }
16 17
17 namespace ui { 18 namespace ui {
18 class Layer; 19 class Layer;
19 } 20 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void OnDeviceScaleFactorChanged(float device_scale_factor) override; 56 void OnDeviceScaleFactorChanged(float device_scale_factor) override;
56 base::Closure PrepareForLayerBoundsChange() override; 57 base::Closure PrepareForLayerBoundsChange() override;
57 58
58 // The object that owns this layer. 59 // The object that owns this layer.
59 FocusRingLayerDelegate* delegate_; 60 FocusRingLayerDelegate* delegate_;
60 61
61 // The current root window containing the focused object. 62 // The current root window containing the focused object.
62 aura::Window* root_window_; 63 aura::Window* root_window_;
63 64
64 // The current layer. 65 // The current layer.
65 scoped_ptr<ui::Layer> layer_; 66 std::unique_ptr<ui::Layer> layer_;
66 67
67 // The bounding rectangle of the focused object, in |root_window_| 68 // The bounding rectangle of the focused object, in |root_window_|
68 // coordinates. 69 // coordinates.
69 gfx::Rect focus_ring_; 70 gfx::Rect focus_ring_;
70 71
71 DISALLOW_COPY_AND_ASSIGN(FocusRingLayer); 72 DISALLOW_COPY_AND_ASSIGN(FocusRingLayer);
72 }; 73 };
73 74
74 } // namespace chromeos 75 } // namespace chromeos
75 76
76 #endif // CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_LAYER_H_ 77 #endif // CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_LAYER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/ui/focus_ring_controller.h ('k') | chrome/browser/chromeos/ui/idle_app_name_notification_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698