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

Side by Side Diff: chrome/browser/ui/views/frame/system_menu_model_builder.h

Issue 2254273003: Remove text encoding UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 3 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 (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> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" 11 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
12 12
13 class Browser; 13 class Browser;
14 class EncodingMenuModel;
15 class ZoomMenuModel; 14 class ZoomMenuModel;
16 15
17 namespace ui { 16 namespace ui {
18 class AcceleratorProvider; 17 class AcceleratorProvider;
19 class MenuModel; 18 class MenuModel;
20 class SimpleMenuModel; 19 class SimpleMenuModel;
21 } 20 }
22 21
23 // SystemMenuModelBuilder is responsible for building and owning the system menu 22 // SystemMenuModelBuilder is responsible for building and owning the system menu
24 // model. 23 // model.
(...skipping 18 matching lines...) Expand all
43 42
44 // Adds items for toggling the frame type (if necessary). 43 // Adds items for toggling the frame type (if necessary).
45 void AddFrameToggleItems(ui::SimpleMenuModel* model); 44 void AddFrameToggleItems(ui::SimpleMenuModel* model);
46 45
47 // Add the items to allow the window to visit the desktop of another user. 46 // Add the items to allow the window to visit the desktop of another user.
48 void AppendTeleportMenu(ui::SimpleMenuModel* model); 47 void AppendTeleportMenu(ui::SimpleMenuModel* model);
49 48
50 SystemMenuModelDelegate menu_delegate_; 49 SystemMenuModelDelegate menu_delegate_;
51 std::unique_ptr<ui::MenuModel> menu_model_; 50 std::unique_ptr<ui::MenuModel> menu_model_;
52 std::unique_ptr<ZoomMenuModel> zoom_menu_contents_; 51 std::unique_ptr<ZoomMenuModel> zoom_menu_contents_;
53 std::unique_ptr<EncodingMenuModel> encoding_menu_contents_;
54 52
55 DISALLOW_COPY_AND_ASSIGN(SystemMenuModelBuilder); 53 DISALLOW_COPY_AND_ASSIGN(SystemMenuModelBuilder);
56 }; 54 };
57 55
58 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ 56 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698