| OLD | NEW |
| 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_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_CONTROLLER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_CONTROLLER_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 "chrome/browser/chromeos/ui/focus_ring_layer.h" | 11 #include "chrome/browser/chromeos/ui/focus_ring_layer.h" |
| 11 #include "ui/views/focus/focus_manager.h" | 12 #include "ui/views/focus/focus_manager.h" |
| 12 #include "ui/views/focus/widget_focus_manager.h" | 13 #include "ui/views/focus/widget_focus_manager.h" |
| 13 #include "ui/views/widget/widget_observer.h" | 14 #include "ui/views/widget/widget_observer.h" |
| 14 | 15 |
| 15 namespace views { | 16 namespace views { |
| 16 class View; | 17 class View; |
| 17 class Widget; | 18 class Widget; |
| 18 } | 19 } |
| 19 | 20 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 55 |
| 55 // views::FocusChangeListener overrides: | 56 // views::FocusChangeListener overrides: |
| 56 void OnWillChangeFocus(views::View* focused_before, | 57 void OnWillChangeFocus(views::View* focused_before, |
| 57 views::View* focused_now) override; | 58 views::View* focused_now) override; |
| 58 void OnDidChangeFocus(views::View* focused_before, | 59 void OnDidChangeFocus(views::View* focused_before, |
| 59 views::View* focused_now) override; | 60 views::View* focused_now) override; |
| 60 | 61 |
| 61 bool visible_; | 62 bool visible_; |
| 62 | 63 |
| 63 views::Widget* widget_; | 64 views::Widget* widget_; |
| 64 scoped_ptr<FocusRingLayer> focus_ring_layer_; | 65 std::unique_ptr<FocusRingLayer> focus_ring_layer_; |
| 65 | 66 |
| 66 DISALLOW_COPY_AND_ASSIGN(FocusRingController); | 67 DISALLOW_COPY_AND_ASSIGN(FocusRingController); |
| 67 }; | 68 }; |
| 68 | 69 |
| 69 } // namespace chromeos | 70 } // namespace chromeos |
| 70 | 71 |
| 71 #endif // CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_CONTROLLER_H_ | 72 #endif // CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_CONTROLLER_H_ |
| OLD | NEW |