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

Side by Side Diff: chrome/browser/ui/app_list/app_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_APP_LIST_APP_CONTEXT_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_CONTEXT_MENU_H_
6 #define CHROME_BROWSER_UI_APP_LIST_APP_CONTEXT_MENU_H_ 6 #define CHROME_BROWSER_UI_APP_LIST_APP_CONTEXT_MENU_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "ui/base/models/simple_menu_model.h" 12 #include "ui/base/models/simple_menu_model.h"
13 13
14 class AppListControllerDelegate; 14 class AppListControllerDelegate;
15 class Profile; 15 class Profile;
16 16
17 namespace app_list { 17 namespace app_list {
18 18
19 class AppContextMenuDelegate; 19 class AppContextMenuDelegate;
20 20
21 // Base class of all context menus in app list view. 21 // Base class of all context menus in app list view.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 Profile* profile() const { return profile_; } 69 Profile* profile() const { return profile_; }
70 AppContextMenuDelegate* delegate() const { return delegate_; } 70 AppContextMenuDelegate* delegate() const { return delegate_; }
71 AppListControllerDelegate* controller() const { return controller_; } 71 AppListControllerDelegate* controller() const { return controller_; }
72 72
73 private: 73 private:
74 AppContextMenuDelegate* delegate_; 74 AppContextMenuDelegate* delegate_;
75 Profile* profile_; 75 Profile* profile_;
76 const std::string app_id_; 76 const std::string app_id_;
77 AppListControllerDelegate* controller_; 77 AppListControllerDelegate* controller_;
78 78
79 scoped_ptr<ui::SimpleMenuModel> menu_model_; 79 std::unique_ptr<ui::SimpleMenuModel> menu_model_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(AppContextMenu); 81 DISALLOW_COPY_AND_ASSIGN(AppContextMenu);
82 }; 82 };
83 83
84 } // namespace app_list 84 } // namespace app_list
85 85
86 #endif // CHROME_BROWSER_UI_APP_LIST_APP_CONTEXT_MENU_H_ 86 #endif // CHROME_BROWSER_UI_APP_LIST_APP_CONTEXT_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/website_settings_popup_android.h ('k') | chrome/browser/ui/app_list/app_context_menu_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698