ash/shelf/shelf_alignment_menu.cc - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

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 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: First cut for review/trybots Created 7 years, 2 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 | Annotate | Revision Log

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/shelf/shelf_layout_manager.h"	7 #include "ash/shelf/shelf_layout_manager.h"

8 #include "ash/shelf/shelf_types.h"	8 #include "ash/shelf/shelf_types.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "grit/ash_strings.h"	10 #include "grit/ash_strings.h"

11 #include "ui/aura/root_window.h"	11 #include "ui/aura/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 ShelfAlignmentMenu::ShelfAlignmentMenu(aura::RootWindow* root)	16 ShelfAlignmentMenu::ShelfAlignmentMenu(aura::Window* root)

17 : ui::SimpleMenuModel(NULL),	17 : ui::SimpleMenuModel(NULL),

18 root_window_(root) {	18 root_window_(root) {

19 DCHECK(root_window_);	19 DCHECK(root_window_);

20 int align_group_id = 1;	20 int align_group_id = 1;

21 set_delegate(this);	21 set_delegate(this);

22 AddRadioItemWithStringId(MENU_ALIGN_LEFT,	22 AddRadioItemWithStringId(MENU_ALIGN_LEFT,

23 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT,	23 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT,

24 align_group_id);	24 align_group_id);

25 AddRadioItemWithStringId(MENU_ALIGN_BOTTOM,	25 AddRadioItemWithStringId(MENU_ALIGN_BOTTOM,

26 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM,	26 IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM,

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 root_window_);	62 root_window_);

63 break;	63 break;

64 case MENU_ALIGN_RIGHT:	64 case MENU_ALIGN_RIGHT:

65 Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT,	65 Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT,

66 root_window_);	66 root_window_);

67 break;	67 break;

68 }	68 }

69 }	69 }

70	70

71 } // namespace ash	71 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/shelf/shelf_alignment_menu.h ('k') | ash/shelf/shelf_layout_manager.h » ('j') | ui/aura/root_window.cc » ('J')