summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 01:08:53 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 01:08:53 +0000
commitd1bc344d61be8d5c885f6b0f65c8c749d8c9d7df (patch)
treea1364faafc210614db261cd36d3f680bc595e16f /chrome/browser/chromeos
parentb2448200e68aab938f1c20259c1efe966da397cf (diff)
downloadchromium_src-d1bc344d61be8d5c885f6b0f65c8c749d8c9d7df.zip
chromium_src-d1bc344d61be8d5c885f6b0f65c8c749d8c9d7df.tar.gz
chromium_src-d1bc344d61be8d5c885f6b0f65c8c749d8c9d7df.tar.bz2
WebUI: Move the contents of CrosPersonalOptionsHandler to PersonalOptionsHandler.
(This was a TODO for jhawkins). BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6312023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc49
-rw-r--r--chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h29
2 files changed, 0 insertions, 78 deletions
diff --git a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc b/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc
deleted file mode 100644
index 2305f3e..0000000
--- a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2011 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/dom_ui/cros_personal_options_handler.h"
-
-#include "base/values.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/dom_ui/web_ui_util.h"
-#include "grit/generated_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/l10n/l10n_util.h"
-
-namespace chromeos {
-
-CrosPersonalOptionsHandler::CrosPersonalOptionsHandler() {
-}
-
-CrosPersonalOptionsHandler::~CrosPersonalOptionsHandler() {
-}
-
-// TODO(jhawkins): Move the contents of this file to PersonalOptionsHandler
-// within an OS_CHROMEOS #ifdef.
-void CrosPersonalOptionsHandler::GetLocalizedValues(
- DictionaryValue* localized_strings) {
- localized_strings->SetString("account",
- l10n_util::GetStringUTF16(IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME));
- localized_strings->SetString("enableScreenlock",
- l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX));
-}
-
-void CrosPersonalOptionsHandler::RegisterMessages() {
- dom_ui_->RegisterMessageCallback(
- "loadAccountPicture",
- NewCallback(this, &CrosPersonalOptionsHandler::LoadAccountPicture));
-}
-
-void CrosPersonalOptionsHandler::LoadAccountPicture(const ListValue* args) {
- const SkBitmap& account_picture =
- UserManager::Get()->logged_in_user().image();
-
- if (!account_picture.isNull()) {
- StringValue data_url(web_ui_util::GetImageDataUrl(account_picture));
- dom_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture",
- data_url);
- }
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h b/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h
deleted file mode 100644
index d286461..0000000
--- a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2010 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_DOM_UI_CROS_PERSONAL_OPTIONS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_DOM_UI_CROS_PERSONAL_OPTIONS_HANDLER_H_
-
-#include "chrome/browser/dom_ui/options/options_ui.h"
-
-namespace chromeos {
-
-class CrosPersonalOptionsHandler : public OptionsPageUIHandler {
- public:
- CrosPersonalOptionsHandler();
- virtual ~CrosPersonalOptionsHandler();
-
- // Overridden from PersonalOptionsHandler:
- virtual void GetLocalizedValues(DictionaryValue* localized_strings);
- virtual void RegisterMessages();
-
- private:
- void LoadAccountPicture(const ListValue* args);
-
- DISALLOW_COPY_AND_ASSIGN(CrosPersonalOptionsHandler);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_DOM_UI_CROS_PERSONAL_OPTIONS_HANDLER_H_