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

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view.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_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // The unique id of the extension, which is used to find the correct 59 // The unique id of the extension, which is used to find the correct
60 // extension after clicking on the image button in the zoom bubble. 60 // extension after clicking on the image button in the zoom bubble.
61 std::string id; 61 std::string id;
62 62
63 // The name of the extension, which appears in the tooltip of the image 63 // The name of the extension, which appears in the tooltip of the image
64 // button in the zoom bubble. 64 // button in the zoom bubble.
65 std::string name; 65 std::string name;
66 66
67 // An image of the extension's icon, which appears in the zoom bubble as an 67 // An image of the extension's icon, which appears in the zoom bubble as an
68 // image button. 68 // image button.
69 scoped_ptr<const extensions::IconImage> icon_image; 69 std::unique_ptr<const extensions::IconImage> icon_image;
70 }; 70 };
71 71
72 ZoomBubbleView(views::View* anchor_view, 72 ZoomBubbleView(views::View* anchor_view,
73 content::WebContents* web_contents, 73 content::WebContents* web_contents,
74 DisplayReason reason, 74 DisplayReason reason,
75 ImmersiveModeController* immersive_mode_controller); 75 ImmersiveModeController* immersive_mode_controller);
76 ~ZoomBubbleView() override; 76 ~ZoomBubbleView() override;
77 77
78 // LocationBarBubbleDelegateView: 78 // LocationBarBubbleDelegateView:
79 void OnGestureEvent(ui::GestureEvent* event) override; 79 void OnGestureEvent(ui::GestureEvent* event) override;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 // The immersive mode controller for the BrowserView containing 135 // The immersive mode controller for the BrowserView containing
136 // |web_contents_|. 136 // |web_contents_|.
137 // Not owned. 137 // Not owned.
138 ImmersiveModeController* immersive_mode_controller_; 138 ImmersiveModeController* immersive_mode_controller_;
139 139
140 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView); 140 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
141 }; 141 };
142 142
143 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 143 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698