| 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/shelf/shelf_layout_manager.h" |
| 8 #include "ash/shelf/shelf_types.h" |
| 8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 9 #include "ash/wm/shelf_layout_manager.h" | |
| 10 #include "grit/ash_strings.h" | 10 #include "grit/ash_strings.h" |
| 11 #include "ui/aura/root_window.h" | 11 #include "ui/aura/root_window.h" |
| 12 #include "ui/base/l10n/l10n_util.h" | 12 #include "ui/base/l10n/l10n_util.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 | 15 |
| 16 LauncherAlignmentMenu::LauncherAlignmentMenu( | 16 LauncherAlignmentMenu::LauncherAlignmentMenu( |
| 17 aura::RootWindow* root) | 17 aura::RootWindow* root) |
| 18 : ui::SimpleMenuModel(NULL), | 18 : ui::SimpleMenuModel(NULL), |
| 19 root_window_(root) { | 19 root_window_(root) { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 root_window_); | 71 root_window_); |
| 72 break; | 72 break; |
| 73 case MENU_ALIGN_TOP: | 73 case MENU_ALIGN_TOP: |
| 74 Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_TOP, | 74 Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_TOP, |
| 75 root_window_); | 75 root_window_); |
| 76 break; | 76 break; |
| 77 } | 77 } |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace ash | 80 } // namespace ash |
| OLD | NEW |