OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_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/views/frame/system_menu_model_delegate.h" | 11 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" |
11 | 12 |
12 class Browser; | 13 class Browser; |
13 class EncodingMenuModel; | 14 class EncodingMenuModel; |
14 class ZoomMenuModel; | 15 class ZoomMenuModel; |
15 | 16 |
16 namespace ui { | 17 namespace ui { |
17 class AcceleratorProvider; | 18 class AcceleratorProvider; |
18 class MenuModel; | 19 class MenuModel; |
19 class SimpleMenuModel; | 20 class SimpleMenuModel; |
(...skipping 20 matching lines...) Expand all Loading... |
40 void BuildSystemMenuForBrowserWindow(ui::SimpleMenuModel* model); | 41 void BuildSystemMenuForBrowserWindow(ui::SimpleMenuModel* model); |
41 void BuildSystemMenuForAppOrPopupWindow(ui::SimpleMenuModel* model); | 42 void BuildSystemMenuForAppOrPopupWindow(ui::SimpleMenuModel* model); |
42 | 43 |
43 // Adds items for toggling the frame type (if necessary). | 44 // Adds items for toggling the frame type (if necessary). |
44 void AddFrameToggleItems(ui::SimpleMenuModel* model); | 45 void AddFrameToggleItems(ui::SimpleMenuModel* model); |
45 | 46 |
46 // Add the items to allow the window to visit the desktop of another user. | 47 // Add the items to allow the window to visit the desktop of another user. |
47 void AppendTeleportMenu(ui::SimpleMenuModel* model); | 48 void AppendTeleportMenu(ui::SimpleMenuModel* model); |
48 | 49 |
49 SystemMenuModelDelegate menu_delegate_; | 50 SystemMenuModelDelegate menu_delegate_; |
50 scoped_ptr<ui::MenuModel> menu_model_; | 51 std::unique_ptr<ui::MenuModel> menu_model_; |
51 scoped_ptr<ZoomMenuModel> zoom_menu_contents_; | 52 std::unique_ptr<ZoomMenuModel> zoom_menu_contents_; |
52 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; | 53 std::unique_ptr<EncodingMenuModel> encoding_menu_contents_; |
53 | 54 |
54 DISALLOW_COPY_AND_ASSIGN(SystemMenuModelBuilder); | 55 DISALLOW_COPY_AND_ASSIGN(SystemMenuModelBuilder); |
55 }; | 56 }; |
56 | 57 |
57 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ | 58 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ |
OLD | NEW |