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

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

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. Created 4 years, 3 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/container_ids.h" 5 #include "ash/mus/container_ids.h"
6 6
7 #include "ash/common/shell_window_ids.h" 7 #include "ash/common/shell_window_ids.h"
8 #include "ash/public/interfaces/container.mojom.h" 8 #include "ash/public/interfaces/container.mojom.h"
9 9
10 using ash::mojom::Container; 10 using ash::mojom::Container;
11 11
12 namespace ash { 12 namespace ash {
13 namespace mus { 13 namespace mus {
14 14
15 int MashContainerToAshShellWindowId(Container container) { 15 int MashContainerToAshShellWindowId(Container container) {
16 switch (container) { 16 switch (container) {
17 case Container::USER_BACKGROUND: 17 case Container::WALLPAPER:
18 return kShellWindowId_DesktopBackgroundContainer; 18 return kShellWindowId_WallpaperContainer;
19 19
20 case Container::USER_PRIVATE_SHELF: 20 case Container::USER_PRIVATE_SHELF:
21 return kShellWindowId_ShelfContainer; 21 return kShellWindowId_ShelfContainer;
22 22
23 case Container::LOGIN_WINDOWS: 23 case Container::LOGIN_WINDOWS:
24 return kShellWindowId_LockScreenContainer; 24 return kShellWindowId_LockScreenContainer;
25 25
26 case Container::STATUS: 26 case Container::STATUS:
27 return kShellWindowId_StatusContainer; 27 return kShellWindowId_StatusContainer;
28 28
29 case Container::BUBBLES: 29 case Container::BUBBLES:
30 // TODO(sky): this mapping isn't right, but BUBBLES should go away once 30 // TODO(sky): this mapping isn't right, but BUBBLES should go away once
31 // http://crbug.com/616859 lands. 31 // http://crbug.com/616859 lands.
32 return kShellWindowId_SettingBubbleContainer; 32 return kShellWindowId_SettingBubbleContainer;
33 33
34 case Container::MENUS: 34 case Container::MENUS:
35 return kShellWindowId_MenuContainer; 35 return kShellWindowId_MenuContainer;
36 36
37 case Container::DRAG_AND_TOOLTIPS: 37 case Container::DRAG_AND_TOOLTIPS:
38 return kShellWindowId_DragImageAndTooltipContainer; 38 return kShellWindowId_DragImageAndTooltipContainer;
39 39
40 case Container::OVERLAY: 40 case Container::OVERLAY:
41 return kShellWindowId_OverlayContainer; 41 return kShellWindowId_OverlayContainer;
42 } 42 }
43 return kShellWindowId_Invalid; 43 return kShellWindowId_Invalid;
44 } 44 }
45 45
46 } // namespace mus 46 } // namespace mus
47 } // namespace ash 47 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/public/interfaces/container.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698