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

Side by Side Diff: ash/mus/context_menu_mus.cc

Issue 2413503002: Cleanup mojo Wallpaper interfaces for mash. (Closed)
Patch Set: Cleanup. Created 4 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
OLDNEW
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/mus/context_menu_mus.h" 5 #include "ash/mus/context_menu_mus.h"
6 6
7 #include "ash/common/shelf/wm_shelf.h" 7 #include "ash/common/shelf/wm_shelf.h"
8 #include "ash/common/wallpaper/wallpaper_controller.h"
8 #include "ash/common/wallpaper/wallpaper_delegate.h" 9 #include "ash/common/wallpaper/wallpaper_delegate.h"
9 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
10 #include "ash/public/cpp/shelf_types.h" 11 #include "ash/public/cpp/shelf_types.h"
11 #include "grit/ash_strings.h" 12 #include "grit/ash_strings.h"
12 13
13 namespace ash { 14 namespace ash {
14 15
15 ContextMenuMus::ContextMenuMus(WmShelf* wm_shelf) 16 ContextMenuMus::ContextMenuMus(WmShelf* wm_shelf)
16 : ui::SimpleMenuModel(nullptr), 17 : ui::SimpleMenuModel(nullptr),
17 wm_shelf_(wm_shelf), 18 wm_shelf_(wm_shelf),
(...skipping 22 matching lines...) Expand all
40 return true; 41 return true;
41 } 42 }
42 43
43 void ContextMenuMus::ExecuteCommand(int command_id, int event_flags) { 44 void ContextMenuMus::ExecuteCommand(int command_id, int event_flags) {
44 if (command_id == MENU_AUTO_HIDE) { 45 if (command_id == MENU_AUTO_HIDE) {
45 wm_shelf_->SetAutoHideBehavior(wm_shelf_->auto_hide_behavior() == 46 wm_shelf_->SetAutoHideBehavior(wm_shelf_->auto_hide_behavior() ==
46 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS 47 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS
47 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER 48 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER
48 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); 49 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
49 } else if (command_id == MENU_CHANGE_WALLPAPER) { 50 } else if (command_id == MENU_CHANGE_WALLPAPER) {
50 WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage(); 51 WmShell::Get()->wallpaper_controller()->OpenSetWallpaperPage();
51 } 52 }
52 } 53 }
53 54
54 } // namespace ash 55 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698