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

Unified Diff: chrome/browser/chromeos/arc/arc_wallpaper_service.cc

Issue 2320323002: Revert of cheets: implement cros side of WallpaperManagerService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/arc/arc_wallpaper_service.h ('k') | components/arc/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/arc/arc_wallpaper_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_wallpaper_service.cc b/chrome/browser/chromeos/arc/arc_wallpaper_service.cc
deleted file mode 100644
index a29851cc0033fc52b359d01fd81c397a5944bbd4..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/arc/arc_wallpaper_service.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/arc/arc_wallpaper_service.h"
-
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "ash/shell.h"
-#include "ash/wallpaper/wallpaper_controller.h"
-#include "base/logging.h"
-#include "base/memory/ptr_util.h"
-#include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
-#include "components/arc/arc_bridge_service.h"
-#include "components/signin/core/account_id/account_id.h"
-#include "components/user_manager/user_manager.h"
-#include "components/wallpaper/wallpaper_files_id.h"
-#include "components/wallpaper/wallpaper_layout.h"
-#include "content/public/browser/browser_thread.h"
-#include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/image/image.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/image/image_util.h"
-
-using user_manager::UserManager;
-
-namespace arc {
-
-namespace {
-
-constexpr char kAndroidWallpaperFilename[] = "android.jpg";
-
-// Sets a decoded bitmap as the wallpaper.
-void SetBitmapAsWallpaper(const SkBitmap& bitmap) {
- // Make the SkBitmap immutable as we won't modify it. This is important
- // because otherwise it gets duplicated during painting, wasting memory.
- SkBitmap immutable_bitmap(bitmap);
- immutable_bitmap.setImmutable();
- gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(immutable_bitmap);
- image.MakeThreadSafe();
-
- chromeos::WallpaperManager* wallpaper_manager =
- chromeos::WallpaperManager::Get();
-
- const AccountId& account_id =
- UserManager::Get()->GetPrimaryUser()->GetAccountId();
- wallpaper::WallpaperFilesId wallpaper_files_id =
- wallpaper_manager->GetFilesId(account_id);
- const bool update_wallpaper =
- account_id == UserManager::Get()->GetActiveUser()->GetAccountId();
- // TODO(crbug.com/618922): Allow specifying layout.
- wallpaper_manager->SetCustomWallpaper(
- account_id, wallpaper_files_id, kAndroidWallpaperFilename,
- wallpaper::WALLPAPER_LAYOUT_STRETCH, user_manager::User::CUSTOMIZED,
- image, update_wallpaper);
-
- // TODO(crbug.com/618922): Register the wallpaper to Chrome OS wallpaper
- // picker. Currently the new wallpaper does not appear there. The best way to
- // make this happen seems to do the same things as wallpaper_api.cc and
- // wallpaper_private_api.cc.
-}
-
-std::vector<uint8_t> EncodeImagePng(const gfx::ImageSkia image) {
- std::vector<uint8_t> result;
- gfx::PNGCodec::FastEncodeBGRASkBitmap(*image.bitmap(), true, &result);
- return result;
-}
-
-} // namespace
-
-ArcWallpaperService::ArcWallpaperService(ArcBridgeService* bridge_service)
- : ArcService(bridge_service), binding_(this) {
- arc_bridge_service()->wallpaper()->AddObserver(this);
- DCHECK(!ArcWallpaperService::instance());
- ArcWallpaperService::set_instance(this);
-}
-
-ArcWallpaperService::~ArcWallpaperService() {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- // Make sure the callback is never called after destruction. It is safe to
- // call Cancel() even when there is no in-flight request.
- ImageDecoder::Cancel(this);
- arc_bridge_service()->wallpaper()->RemoveObserver(this);
- DCHECK(ArcWallpaperService::instance() == this);
- ArcWallpaperService::set_instance(nullptr);
-}
-
-void ArcWallpaperService::OnInstanceReady() {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- mojom::WallpaperInstance* wallpaper_instance =
- arc_bridge_service()->wallpaper()->instance();
- if (!wallpaper_instance) {
- LOG(DFATAL) << "OnWallpaperInstanceReady called, "
- << "but no wallpaper instance found";
- return;
- }
- wallpaper_instance->Init(binding_.CreateInterfacePtrAndBind());
-}
-
-void ArcWallpaperService::SetWallpaper(mojo::Array<uint8_t> png_data) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- ImageDecoder::Cancel(this);
- ImageDecoder::StartWithOptions(this, png_data.PassStorage(),
- ImageDecoder::ROBUST_PNG_CODEC, true);
-}
-
-void ArcWallpaperService::GetWallpaper(const GetWallpaperCallback& callback) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- ash::WallpaperController* wc =
- ash::Shell::GetInstance()->wallpaper_controller();
- gfx::ImageSkia wallpaper = wc->GetWallpaper();
- base::PostTaskAndReplyWithResult(
- content::BrowserThread::GetBlockingPool(), FROM_HERE,
- base::Bind(&EncodeImagePng, wallpaper), callback);
-}
-
-void ArcWallpaperService::SetWallpaperJpeg(
- const std::vector<uint8_t>& jpeg_data) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- // If there is an in-flight request, cancel it. It is safe to call Cancel()
- // even when there is no in-flight request.
- ImageDecoder::Cancel(this);
- ImageDecoder::StartWithOptions(this, std::move(jpeg_data),
- ImageDecoder::ROBUST_JPEG_CODEC, true);
-}
-
-void ArcWallpaperService::OnImageDecoded(const SkBitmap& bitmap) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- SetBitmapAsWallpaper(bitmap);
-}
-
-void ArcWallpaperService::OnDecodeImageFailed() {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- LOG(ERROR) << "Failed to decode wallpaper image.";
-}
-
-} // namespace arc
« no previous file with comments | « chrome/browser/chromeos/arc/arc_wallpaper_service.h ('k') | components/arc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698