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

Side by Side Diff: ash/shelf/shelf_alignment_menu.h

Issue 1812013003: Pass shelf instances, not root windows, for ash context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Call OnShelfAlignmentChanged after LayoutShelf. Created 4 years, 9 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/shelf/shelf.cc ('k') | ash/shelf/shelf_alignment_menu.cc » ('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 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 ASH_SHELF_SHELF_ALIGNMENT_MENU_H_ 5 #ifndef ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
6 #define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_ 6 #define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/base/models/simple_menu_model.h" 10 #include "ui/base/models/simple_menu_model.h"
11 11
12 namespace aura { 12 namespace ash {
13 class RootWindow;
14 }
15 13
16 namespace ash { 14 class Shelf;
17 15
18 // Submenu for choosing the alignment of the launcher. 16 // Submenu for choosing the alignment of the launcher.
19 class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel, 17 class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel,
20 public ui::SimpleMenuModel::Delegate { 18 public ui::SimpleMenuModel::Delegate {
21 public: 19 public:
22 explicit ShelfAlignmentMenu(aura::Window* root); 20 explicit ShelfAlignmentMenu(Shelf* shelf);
23 ~ShelfAlignmentMenu() override; 21 ~ShelfAlignmentMenu() override;
24 22
25 // ui::SimpleMenuModel::Delegate overrides: 23 // ui::SimpleMenuModel::Delegate overrides:
26 bool IsCommandIdChecked(int command_id) const override; 24 bool IsCommandIdChecked(int command_id) const override;
27 bool IsCommandIdEnabled(int command_id) const override; 25 bool IsCommandIdEnabled(int command_id) const override;
28 bool GetAcceleratorForCommandId(int command_id, 26 bool GetAcceleratorForCommandId(int command_id,
29 ui::Accelerator* accelerator) override; 27 ui::Accelerator* accelerator) override;
30 void ExecuteCommand(int command_id, int event_flags) override; 28 void ExecuteCommand(int command_id, int event_flags) override;
31 29
32 private: 30 private:
33 enum MenuItem { 31 enum MenuItem {
34 // Offset so as not to interfere with other menus. 32 // Offset so as not to interfere with other menus.
35 MENU_ALIGN_LEFT = 500, 33 MENU_ALIGN_LEFT = 500,
36 MENU_ALIGN_RIGHT, 34 MENU_ALIGN_RIGHT,
37 MENU_ALIGN_BOTTOM, 35 MENU_ALIGN_BOTTOM,
38 }; 36 };
39 37
40 aura::Window* root_window_; 38 Shelf* shelf_;
41 39
42 DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu); 40 DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu);
43 }; 41 };
44 42
45 } // namespace ash 43 } // namespace ash
46 44
47 #endif // ASH_SHELF_SHELF_ALIGNMENT_MENU_H_ 45 #endif // ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf.cc ('k') | ash/shelf/shelf_alignment_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698