| Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
|
| index feca332ea317346d0fe738c62b087661436bbcf0..e677d1c48db6177e06c76b33384ed4a3b526f66c 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2013 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.
|
|
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/url_constants.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "grit/generated_resources.h"
|
| #include "net/base/data_url.h"
|
| @@ -24,6 +25,8 @@
|
| #include "ui/views/widget/widget.h"
|
| #include "ui/webui/web_ui_util.h"
|
|
|
| +using content::BrowserThread;
|
| +
|
| namespace chromeos {
|
|
|
| UserImageScreenHandler::UserImageScreenHandler()
|
| @@ -190,6 +193,7 @@ void UserImageScreenHandler::HandleGetImages(const base::ListValue* args) {
|
| }
|
|
|
| void UserImageScreenHandler::HandlePhotoTaken(const base::ListValue* args) {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| std::string image_url;
|
| if (!args || args->GetSize() != 1 || !args->GetString(0, &image_url))
|
| NOTREACHED();
|
| @@ -207,7 +211,9 @@ void UserImageScreenHandler::HandlePhotoTaken(const base::ListValue* args) {
|
| image_decoder_->set_delegate(NULL);
|
| image_decoder_ = new ImageDecoder(this, raw_data,
|
| ImageDecoder::DEFAULT_CODEC);
|
| - image_decoder_->Start();
|
| + scoped_refptr<base::MessageLoopProxy> task_runner =
|
| + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
|
| + image_decoder_->Start(task_runner);
|
| }
|
|
|
| void UserImageScreenHandler::HandleCheckCameraPresence(
|
|
|