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

Side by Side Diff: chrome/browser/ui/views/exclusive_access_bubble_views.h

Issue 1865213004: Convert //chrome/browser/ui 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_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h" 12 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h"
12 #include "content/public/browser/notification_observer.h" 13 #include "content/public/browser/notification_observer.h"
13 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
14 #include "ui/views/widget/widget_observer.h" 15 #include "ui/views/widget/widget_observer.h"
15 16
16 class ExclusiveAccessBubbleViewsContext; 17 class ExclusiveAccessBubbleViewsContext;
17 class GURL; 18 class GURL;
18 namespace gfx { 19 namespace gfx {
19 class SlideAnimation; 20 class SlideAnimation;
20 } 21 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 const content::NotificationDetails& details) override; 87 const content::NotificationDetails& details) override;
87 88
88 // views::WidgetObserver override: 89 // views::WidgetObserver override:
89 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override; 90 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override;
90 91
91 ExclusiveAccessBubbleViewsContext* const bubble_view_context_; 92 ExclusiveAccessBubbleViewsContext* const bubble_view_context_;
92 93
93 views::Widget* popup_; 94 views::Widget* popup_;
94 95
95 // Animation controlling showing/hiding of the exit bubble. 96 // Animation controlling showing/hiding of the exit bubble.
96 scoped_ptr<gfx::SlideAnimation> animation_; 97 std::unique_ptr<gfx::SlideAnimation> animation_;
97 98
98 // Attribute animated by |animation_|. 99 // Attribute animated by |animation_|.
99 AnimatedAttribute animated_attribute_; 100 AnimatedAttribute animated_attribute_;
100 101
101 // The contents of the popup. 102 // The contents of the popup.
102 ExclusiveAccessView* view_; 103 ExclusiveAccessView* view_;
103 104
104 content::NotificationRegistrar registrar_; 105 content::NotificationRegistrar registrar_;
105 106
106 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessBubbleViews); 107 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessBubbleViews);
107 }; 108 };
108 109
109 #endif // CHROME_BROWSER_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_ 110 #endif // CHROME_BROWSER_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/elevation_icon_setter.cc ('k') | chrome/browser/ui/views/exclusive_access_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698