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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.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_COCOA_LOCATION_BAR_MANAGE_PASSWORDS_DECORATION_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_MANAGE_PASSWORDS_DECORATION_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_MANAGE_PASSWORDS_DECORATION_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_MANAGE_PASSWORDS_DECORATION_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory>
11
10 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h" 14 #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
14 #include "chrome/browser/ui/passwords/manage_passwords_icon.h" 15 #include "chrome/browser/ui/passwords/manage_passwords_icon.h"
15 16
16 class CommandUpdater; 17 class CommandUpdater;
17 class LocationBarViewMac; 18 class LocationBarViewMac;
18 class ManagePasswordsDecoration; 19 class ManagePasswordsDecoration;
19 20
20 // Cocoa implementation of ManagePasswordsIcon that delegates to 21 // Cocoa implementation of ManagePasswordsIcon that delegates to
21 // ManagePasswordsDecoration. 22 // ManagePasswordsDecoration.
22 class ManagePasswordsIconCocoa : public ManagePasswordsIcon { 23 class ManagePasswordsIconCocoa : public ManagePasswordsIcon {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // Updates child view states. 64 // Updates child view states.
64 void UpdateUIState(); 65 void UpdateUIState();
65 66
66 // Shows the manage passwords bubble. 67 // Shows the manage passwords bubble.
67 CommandUpdater* command_updater_; // Weak, owned by Browser. 68 CommandUpdater* command_updater_; // Weak, owned by Browser.
68 69
69 // Displays all the decorations. 70 // Displays all the decorations.
70 LocationBarViewMac* location_bar_; // Weak, owns us. 71 LocationBarViewMac* location_bar_; // Weak, owns us.
71 72
72 // The platform-independent interface. 73 // The platform-independent interface.
73 scoped_ptr<ManagePasswordsIconCocoa> icon_; 74 std::unique_ptr<ManagePasswordsIconCocoa> icon_;
74 75
75 DISALLOW_COPY_AND_ASSIGN(ManagePasswordsDecoration); 76 DISALLOW_COPY_AND_ASSIGN(ManagePasswordsDecoration);
76 }; 77 };
77 78
78 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_MANAGE_PASSWORDS_DECORATION_H_ 79 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_MANAGE_PASSWORDS_DECORATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698