| 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/sysui_application.h" | 5 #include "ash/sysui/sysui_application.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 namespace { | 61 namespace { |
| 62 | 62 |
| 63 const char kResourceFileStrings[] = "ash_test_strings.pak"; | 63 const char kResourceFileStrings[] = "ash_test_strings.pak"; |
| 64 const char kResourceFile100[] = "ash_test_resources_100_percent.pak"; | 64 const char kResourceFile100[] = "ash_test_resources_100_percent.pak"; |
| 65 const char kResourceFile200[] = "ash_test_resources_200_percent.pak"; | 65 const char kResourceFile200[] = "ash_test_resources_200_percent.pak"; |
| 66 | 66 |
| 67 // Tries to determine the corresponding mash container from widget init params. | 67 // Tries to determine the corresponding mash container from widget init params. |
| 68 bool GetContainerForWidget(const views::Widget::InitParams& params, | 68 bool GetContainerForWidget(const views::Widget::InitParams& params, |
| 69 ash::mojom::Container* container) { | 69 ash::mojom::Container* container) { |
| 70 switch (params.parent->id()) { | 70 switch (params.parent->id()) { |
| 71 case kShellWindowId_DesktopBackgroundContainer: | 71 case kShellWindowId_WallpaperContainer: |
| 72 *container = ash::mojom::Container::USER_BACKGROUND; | 72 *container = ash::mojom::Container::WALLPAPER; |
| 73 return true; | 73 return true; |
| 74 | 74 |
| 75 case kShellWindowId_ShelfContainer: | 75 case kShellWindowId_ShelfContainer: |
| 76 *container = ash::mojom::Container::USER_PRIVATE_SHELF; | 76 *container = ash::mojom::Container::USER_PRIVATE_SHELF; |
| 77 return true; | 77 return true; |
| 78 | 78 |
| 79 case kShellWindowId_StatusContainer: | 79 case kShellWindowId_StatusContainer: |
| 80 *container = ash::mojom::Container::STATUS; | 80 *container = ash::mojom::Container::STATUS; |
| 81 return true; | 81 return true; |
| 82 } | 82 } |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 void SysUIApplication::Create(const ::shell::Identity& remote_identity, | 341 void SysUIApplication::Create(const ::shell::Identity& remote_identity, |
| 342 mojom::WallpaperControllerRequest request) { | 342 mojom::WallpaperControllerRequest request) { |
| 343 mojom::WallpaperController* wallpaper_controller = | 343 mojom::WallpaperController* wallpaper_controller = |
| 344 static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate()); | 344 static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate()); |
| 345 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, | 345 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, |
| 346 std::move(request)); | 346 std::move(request)); |
| 347 } | 347 } |
| 348 | 348 |
| 349 } // namespace sysui | 349 } // namespace sysui |
| 350 } // namespace ash | 350 } // namespace ash |
| OLD | NEW |