OLD | NEW |
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 #include "ash/launcher/launcher_alignment_menu.h" | 5 #include "ash/launcher/launcher_alignment_menu.h" |
6 | 6 |
| 7 #include "ash/shelf_types.h" |
7 #include "ash/shell.h" | 8 #include "ash/shell.h" |
8 #include "ash/wm/shelf_types.h" | |
9 #include "grit/ash_strings.h" | 9 #include "grit/ash_strings.h" |
10 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
11 | 11 |
12 namespace ash { | 12 namespace ash { |
13 | 13 |
14 LauncherAlignmentMenu::LauncherAlignmentMenu( | 14 LauncherAlignmentMenu::LauncherAlignmentMenu( |
15 aura::RootWindow* root) | 15 aura::RootWindow* root) |
16 : ui::SimpleMenuModel(NULL), | 16 : ui::SimpleMenuModel(NULL), |
17 root_window_(root) { | 17 root_window_(root) { |
18 DCHECK(root_window_); | 18 DCHECK(root_window_); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 root_window_); | 69 root_window_); |
70 break; | 70 break; |
71 case MENU_ALIGN_RIGHT: | 71 case MENU_ALIGN_RIGHT: |
72 Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT, | 72 Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT, |
73 root_window_); | 73 root_window_); |
74 break; | 74 break; |
75 } | 75 } |
76 } | 76 } |
77 | 77 |
78 } // namespace ash | 78 } // namespace ash |
OLD | NEW |