ash/sysui/context_menu_mus.cc - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf

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/sysui/context_menu_mus.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again 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/system/web_notification/web_notification_tray.cc ('k') | ash/sysui/shelf_delegate_mus.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/sysui/context_menu_mus.h"	5 #include "ash/sysui/context_menu_mus.h"

6	6

	7 #include "ash/common/shelf/shelf_types.h"

7 #include "ash/desktop_background/user_wallpaper_delegate.h"	8 #include "ash/desktop_background/user_wallpaper_delegate.h"

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

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

10 #include "ash/shell.h"	10 #include "ash/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 ContextMenuMus::ContextMenuMus(ash::Shelf* shelf)	15 ContextMenuMus::ContextMenuMus(ash::Shelf* shelf)

16 : ui::SimpleMenuModel(nullptr), shelf_(shelf), alignment_menu_(shelf) {	16 : ui::SimpleMenuModel(nullptr), shelf_(shelf), alignment_menu_(shelf) {

17 DCHECK(shelf_);	17 DCHECK(shelf_);

18 set_delegate(this);	18 set_delegate(this);

19 AddCheckItemWithStringId(MENU_AUTO_HIDE,	19 AddCheckItemWithStringId(MENU_AUTO_HIDE,

(...skipping 30 matching lines...) Expand all Loading...
50 shelf_->SetAutoHideBehavior(shelf_->auto_hide_behavior() ==	50 shelf_->SetAutoHideBehavior(shelf_->auto_hide_behavior() ==

51 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS	51 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS

52 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER	52 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER

53 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);	53 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);

54 } else if (command_id == MENU_CHANGE_WALLPAPER) {	54 } else if (command_id == MENU_CHANGE_WALLPAPER) {

55 Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();	55 Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();

56 }	56 }

57 }	57 }

58	58

59 } // namespace ash	59 } // namespace ash

OLD	NEW