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/shelf/shelf_alignment_menu.h" |
6 | 6 |
7 #include "ash/metrics/user_metrics_recorder.h" | 7 #include "ash/metrics/user_metrics_recorder.h" |
8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
9 #include "ash/shelf/shelf_types.h" | 9 #include "ash/shelf/shelf_types.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM, | 27 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM, |
28 align_group_id); | 28 align_group_id); |
29 AddRadioItemWithStringId(MENU_ALIGN_RIGHT, | 29 AddRadioItemWithStringId(MENU_ALIGN_RIGHT, |
30 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_RIGHT, | 30 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_RIGHT, |
31 align_group_id); | 31 align_group_id); |
32 } | 32 } |
33 | 33 |
34 ShelfAlignmentMenu::~ShelfAlignmentMenu() {} | 34 ShelfAlignmentMenu::~ShelfAlignmentMenu() {} |
35 | 35 |
36 bool ShelfAlignmentMenu::IsCommandIdChecked(int command_id) const { | 36 bool ShelfAlignmentMenu::IsCommandIdChecked(int command_id) const { |
37 return internal::ShelfLayoutManager::ForLauncher(root_window_)-> | 37 return internal::ShelfLayoutManager::ForShelf(root_window_)-> |
38 SelectValueForShelfAlignment( | 38 SelectValueForShelfAlignment( |
39 MENU_ALIGN_BOTTOM == command_id, | 39 MENU_ALIGN_BOTTOM == command_id, |
40 MENU_ALIGN_LEFT == command_id, | 40 MENU_ALIGN_LEFT == command_id, |
41 MENU_ALIGN_RIGHT == command_id, | 41 MENU_ALIGN_RIGHT == command_id, |
42 false); | 42 false); |
43 } | 43 } |
44 | 44 |
45 bool ShelfAlignmentMenu::IsCommandIdEnabled(int command_id) const { | 45 bool ShelfAlignmentMenu::IsCommandIdEnabled(int command_id) const { |
46 return true; | 46 return true; |
47 } | 47 } |
(...skipping 21 matching lines...) Expand all Loading... |
69 case MENU_ALIGN_RIGHT: | 69 case MENU_ALIGN_RIGHT: |
70 Shell::GetInstance()->metrics()-> | 70 Shell::GetInstance()->metrics()-> |
71 RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_RIGHT); | 71 RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_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 |