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

Side by Side Diff: chrome/browser/ui/views/profiles/avatar_menu_button.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PROFILES_AVATAR_MENU_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_MENU_BUTTON_H_
6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_MENU_BUTTON_H_ 6 #define CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_MENU_BUTTON_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 bool DoesIntersectRect(const views::View* target, 63 bool DoesIntersectRect(const views::View* target,
64 const gfx::Rect& rect) const override; 64 const gfx::Rect& rect) const override;
65 65
66 // views::MenuButtonListener: 66 // views::MenuButtonListener:
67 void OnMenuButtonClicked(views::MenuButton* source, 67 void OnMenuButtonClicked(views::MenuButton* source,
68 const gfx::Point& point, 68 const gfx::Point& point,
69 const ui::Event* event) override; 69 const ui::Event* event) override;
70 70
71 BrowserView* browser_view_; 71 BrowserView* browser_view_;
72 bool enabled_; 72 bool enabled_;
73 scoped_ptr<ui::MenuModel> menu_model_; 73 std::unique_ptr<ui::MenuModel> menu_model_;
74 74
75 // Use a scoped ptr because gfx::Image doesn't have a default constructor. 75 // Use a scoped ptr because gfx::Image doesn't have a default constructor.
76 scoped_ptr<gfx::Image> icon_; 76 std::unique_ptr<gfx::Image> icon_;
77 gfx::ImageSkia button_icon_; 77 gfx::ImageSkia button_icon_;
78 bool is_rectangle_; 78 bool is_rectangle_;
79 int old_height_; 79 int old_height_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton); 81 DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton);
82 }; 82 };
83 83
84 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_MENU_BUTTON_H_ 84 #endif // CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_MENU_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698