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

Unified Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

Issue 2718043002: Replace more hardcoded "ash" strings with ash::mojom::kServiceName (Closed)
Patch Set: Remove ash_util includes that are no longer needed. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
index cd1566ba705a2f08db57f31cd343a5a38528735c..ef070f78a2dc2c839e0a2fb6dcbead89e89c9b89 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
@@ -9,6 +9,7 @@
#include "ash/common/ash_constants.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wm_shell.h"
+#include "ash/public/interfaces/constants.mojom.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
@@ -205,8 +206,7 @@ void SetWallpaper(const gfx::ImageSkia& image,
return;
ash::mojom::WallpaperControllerPtr wallpaper_controller;
- connector->BindInterface(ash_util::GetAshServiceName(),
- &wallpaper_controller);
+ connector->BindInterface(ash::mojom::kServiceName, &wallpaper_controller);
// TODO(crbug.com/655875): Optimize ash wallpaper transport; avoid sending
// large bitmaps over Mojo; use shared memory like BitmapUploader, etc.
wallpaper_controller->SetWallpaper(*image.bitmap(), layout);
@@ -888,7 +888,7 @@ WallpaperManager::WallpaperManager()
if (connection && connection->GetConnector()) {
// Connect to the wallpaper controller interface in the ash service.
ash::mojom::WallpaperControllerPtr wallpaper_controller_ptr;
- connection->GetConnector()->BindInterface(ash_util::GetAshServiceName(),
+ connection->GetConnector()->BindInterface(ash::mojom::kServiceName,
&wallpaper_controller_ptr);
// Register this object as the wallpaper picker.
wallpaper_controller_ptr->SetWallpaperPicker(
« no previous file with comments | « chrome/browser/chromeos/locale_change_guard.cc ('k') | chrome/browser/chromeos/settings/shutdown_policy_forwarder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698