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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.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 | « chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h ('k') | no next file » | 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_CONTEXT_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
7 7
8 #include "ash/common/shelf/shelf_alignment_menu.h"
8 #include "ash/common/shelf/shelf_item_types.h" 9 #include "ash/common/shelf/shelf_item_types.h"
9 #include "ash/shelf/shelf_alignment_menu.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "ui/base/models/simple_menu_model.h" 12 #include "ui/base/models/simple_menu_model.h"
13 13
14 class ChromeLauncherController; 14 class ChromeLauncherController;
15 15
16 namespace ash { 16 namespace ash {
17 class WmShelf; 17 class WmShelf;
18 } 18 }
19 19
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ash::ShelfItem item_; 95 ash::ShelfItem item_;
96 96
97 ash::ShelfAlignmentMenu shelf_alignment_menu_; 97 ash::ShelfAlignmentMenu shelf_alignment_menu_;
98 98
99 ash::WmShelf* wm_shelf_; 99 ash::WmShelf* wm_shelf_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu); 101 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
102 }; 102 };
103 103
104 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 104 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698