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

Side by Side Diff: chrome/browser/ui/ash/launcher/extension_launcher_context_menu.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_ASH_LAUNCHER_EXTENSION_LAUNCHER_CONTEXT_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_LAUNCHER_CONTEXT_MENU_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_LAUNCHER_CONTEXT_MENU_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_LAUNCHER_CONTEXT_MENU_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/ui/ash/launcher/launcher_context_menu.h" 11 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
11 12
12 class ChromeLauncherController; 13 class ChromeLauncherController;
13 14
14 namespace ash { 15 namespace ash {
15 class Shelf; 16 class Shelf;
16 struct ShelfItem; 17 struct ShelfItem;
17 } 18 }
18 19
19 namespace extensions { 20 namespace extensions {
(...skipping 12 matching lines...) Expand all
32 // ui::SimpleMenuModel::Delegate overrides: 33 // ui::SimpleMenuModel::Delegate overrides:
33 bool IsItemForCommandIdDynamic(int command_id) const override; 34 bool IsItemForCommandIdDynamic(int command_id) const override;
34 base::string16 GetLabelForCommandId(int command_id) const override; 35 base::string16 GetLabelForCommandId(int command_id) const override;
35 bool IsCommandIdChecked(int command_id) const override; 36 bool IsCommandIdChecked(int command_id) const override;
36 bool IsCommandIdEnabled(int command_id) const override; 37 bool IsCommandIdEnabled(int command_id) const override;
37 void ExecuteCommand(int command_id, int event_flags) override; 38 void ExecuteCommand(int command_id, int event_flags) override;
38 39
39 private: 40 private:
40 void Init(); 41 void Init();
41 42
42 scoped_ptr<extensions::ContextMenuMatcher> extension_items_; 43 std::unique_ptr<extensions::ContextMenuMatcher> extension_items_;
43 44
44 DISALLOW_COPY_AND_ASSIGN(ExtensionLauncherContextMenu); 45 DISALLOW_COPY_AND_ASSIGN(ExtensionLauncherContextMenu);
45 }; 46 };
46 47
47 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_LAUNCHER_CONTEXT_MENU_H_ 48 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_LAUNCHER_CONTEXT_MENU_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698