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

Side by Side Diff: ash/common/shelf/shelf_alignment_menu.cc

Issue 2046563012: mash: Move shelf menu code to //ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/common/shelf/shelf_alignment_menu.h ('k') | ash/common/shelf/shelf_menu_model.h » ('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 #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
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
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_alignment_menu.h ('k') | ash/common/shelf/shelf_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698