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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h

Issue 2046563012: mash: Move shelf menu code to //ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « ash/sysui/shelf_delegate_mus.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_LAUNCHER_APPLICATION_MENU_ITEM_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APPLICATION_MENU_ITEM_MODEL_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APPLICATION_MENU_ITEM_MODEL_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APPLICATION_MENU_ITEM_MODEL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/shelf/shelf_menu_model.h" 10 #include "ash/common/shelf/shelf_menu_model.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 13
14 class ChromeLauncherAppMenuItem; 14 class ChromeLauncherAppMenuItem;
15 class LauncherApplicationMenuItemModelTestAPI; 15 class LauncherApplicationMenuItemModelTestAPI;
16 16
17 // A list of the elements which makes up a simple menu description. 17 // A list of the elements which makes up a simple menu description.
18 typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems; 18 typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;
19 19
20 // A menu model that builds the contents of a menu for a launcher item 20 // A menu model that builds the contents of a menu for a launcher item
(...skipping 27 matching lines...) Expand all
48 void RecordMenuItemSelectedMetrics(int command_id, 48 void RecordMenuItemSelectedMetrics(int command_id,
49 int num_menu_items_enabled); 49 int num_menu_items_enabled);
50 50
51 // The list of menu items as returned from the launcher controller. 51 // The list of menu items as returned from the launcher controller.
52 ChromeLauncherAppMenuItems launcher_items_; 52 ChromeLauncherAppMenuItems launcher_items_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(LauncherApplicationMenuItemModel); 54 DISALLOW_COPY_AND_ASSIGN(LauncherApplicationMenuItemModel);
55 }; 55 };
56 56
57 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APPLICATION_MENU_ITEM_MODEL_H _ 57 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APPLICATION_MENU_ITEM_MODEL_H _
OLDNEW
« no previous file with comments | « ash/sysui/shelf_delegate_mus.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698