| OLD | NEW |
| 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 #include "ash/shelf/shelf_alignment_menu.h" | 5 #include "ash/common/shelf/shelf_alignment_menu.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_types.h" | 7 #include "ash/common/shelf/shelf_types.h" |
| 8 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
| 9 #include "ash/common/wm/wm_user_metrics_action.h" | 9 #include "ash/common/wm/wm_user_metrics_action.h" |
| 10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
| 11 #include "grit/ash_strings.h" | 11 #include "grit/ash_strings.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 | 14 |
| 15 ShelfAlignmentMenu::ShelfAlignmentMenu(WmShelf* wm_shelf) | 15 ShelfAlignmentMenu::ShelfAlignmentMenu(WmShelf* wm_shelf) |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 break; | 68 break; |
| 69 case MENU_ALIGN_RIGHT: | 69 case MENU_ALIGN_RIGHT: |
| 70 shell->RecordUserMetricsAction( | 70 shell->RecordUserMetricsAction( |
| 71 wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_RIGHT); | 71 wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_RIGHT); |
| 72 wm_shelf_->SetAlignment(SHELF_ALIGNMENT_RIGHT); | 72 wm_shelf_->SetAlignment(SHELF_ALIGNMENT_RIGHT); |
| 73 break; | 73 break; |
| 74 } | 74 } |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace ash | 77 } // namespace ash |
| OLD | NEW |