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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_app_icon_loader.cc

Issue 2810973004: Revert of Fetch ARC Kiosk app name and icon from Android side. (Closed)
Patch Set: Created 3 years, 8 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/app_mode/kiosk_app_icon_loader.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_icon_loader.cc b/chrome/browser/chromeos/app_mode/kiosk_app_icon_loader.cc
deleted file mode 100644
index cb46f50a632d60ede2f973690983e262950c78be..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/app_mode/kiosk_app_icon_loader.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2017 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/app_mode/kiosk_app_icon_loader.h"
-
-#include <vector>
-
-#include "base/bind.h"
-#include "base/files/file_path.h"
-#include "base/files/file_util.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/image_decoder.h"
-#include "content/public/browser/browser_thread.h"
-
-using content::BrowserThread;
-
-namespace chromeos {
-
-class IconImageRequest : public ImageDecoder::ImageRequest {
- public:
- IconImageRequest(const scoped_refptr<base::SequencedTaskRunner>& task_runner,
- KioskAppIconLoader::ResultCallback result_callback)
- : ImageRequest(task_runner), result_callback_(result_callback) {}
-
- void OnImageDecoded(const SkBitmap& decoded_image) override {
- gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
- image.MakeThreadSafe();
- BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
- base::Bind(result_callback_, image));
- delete this;
- }
-
- void OnDecodeImageFailed() override {
- LOG(ERROR) << "Failed to decode icon image.";
- BrowserThread::PostTask(
- BrowserThread::UI, FROM_HERE,
- base::Bind(result_callback_, base::Optional<gfx::ImageSkia>()));
- delete this;
- }
-
- private:
- ~IconImageRequest() override = default;
- KioskAppIconLoader::ResultCallback result_callback_;
-};
-
-void LoadOnBlockingPool(
- const base::FilePath& icon_path,
- scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
- KioskAppIconLoader::ResultCallback result_callback) {
- DCHECK(callback_task_runner->RunsTasksOnCurrentThread());
-
- std::string data;
- if (!base::ReadFileToString(base::FilePath(icon_path), &data)) {
- LOG(ERROR) << "Failed to read icon file.";
- BrowserThread::PostTask(
- BrowserThread::UI, FROM_HERE,
- base::Bind(result_callback, base::Optional<gfx::ImageSkia>()));
- return;
- }
-
- // IconImageRequest will delete itself on completion of ImageDecoder callback.
- IconImageRequest* image_request =
- new IconImageRequest(callback_task_runner, result_callback);
- ImageDecoder::Start(image_request,
- std::vector<uint8_t>(data.begin(), data.end()));
-}
-
-KioskAppIconLoader::KioskAppIconLoader(Delegate* delegate)
- : delegate_(delegate), weak_factory_(this) {}
-
-KioskAppIconLoader::~KioskAppIconLoader() = default;
-
-void KioskAppIconLoader::Start(const base::FilePath& icon_path) {
- base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
- base::SequencedWorkerPool::SequenceToken token = pool->GetSequenceToken();
- task_runner_ = pool->GetSequencedTaskRunnerWithShutdownBehavior(
- token, base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
- task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&LoadOnBlockingPool, icon_path, task_runner_,
- base::Bind(&KioskAppIconLoader::OnImageDecodingFinished,
- weak_factory_.GetWeakPtr())));
-}
-
-void KioskAppIconLoader::OnImageDecodingFinished(
- base::Optional<gfx::ImageSkia> result) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
- if (result.has_value()) {
- delegate_->OnIconLoadSuccess(result.value());
- } else {
- delegate_->OnIconLoadFailure();
- }
-}
-
-} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_icon_loader.h ('k') | chrome/browser/chromeos/app_mode/kiosk_app_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698