ash/shelf/shelf_alignment_menu.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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

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/common/wm_shell.h"

7 #include "ash/metrics/user_metrics_action.h"	8 #include "ash/metrics/user_metrics_action.h"

8 #include "ash/public/cpp/shelf_types.h"	9 #include "ash/public/cpp/shelf_types.h"

9 #include "ash/shelf/wm_shelf.h"	10 #include "ash/shelf/wm_shelf.h"

10 #include "ash/strings/grit/ash_strings.h"	11 #include "ash/strings/grit/ash_strings.h"

11 #include "ash/wm_shell.h"

12	12

13 namespace ash {	13 namespace ash {

14	14

15 ShelfAlignmentMenu::ShelfAlignmentMenu(WmShelf* wm_shelf)	15 ShelfAlignmentMenu::ShelfAlignmentMenu(WmShelf* wm_shelf)

16 : ui::SimpleMenuModel(nullptr), wm_shelf_(wm_shelf) {	16 : ui::SimpleMenuModel(nullptr), wm_shelf_(wm_shelf) {

17 DCHECK(wm_shelf_);	17 DCHECK(wm_shelf_);

18 const int align_group_id = 1;	18 const int align_group_id = 1;

19 set_delegate(this);	19 set_delegate(this);

20 AddRadioItemWithStringId(	20 AddRadioItemWithStringId(

21 MENU_ALIGN_LEFT, IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT, align_group_id);	21 MENU_ALIGN_LEFT, IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT, align_group_id);

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 wm_shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM);	57 wm_shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM);

58 break;	58 break;

59 case MENU_ALIGN_RIGHT:	59 case MENU_ALIGN_RIGHT:

60 shell->RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_RIGHT);	60 shell->RecordUserMetricsAction(UMA_SHELF_ALIGNMENT_SET_RIGHT);

61 wm_shelf_->SetAlignment(SHELF_ALIGNMENT_RIGHT);	61 wm_shelf_->SetAlignment(SHELF_ALIGNMENT_RIGHT);

62 break;	62 break;

63 }	63 }

64 }	64 }

65	65

66 } // namespace ash	66 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_background_animator.h » ('j') | no next file with comments »