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

Side by Side Diff: chrome/browser/dom_ui/options/personal_options_handler.cc

Issue 6541006: WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/dom_ui/options/options_ui.h ('k') | chrome/browser/dom_ui/plugins_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/dom_ui/options/personal_options_handler.h" 5 #include "chrome/browser/dom_ui/options/personal_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/common/notification_service.h" 29 #include "chrome/common/notification_service.h"
30 #include "grit/browser_resources.h" 30 #include "grit/browser_resources.h"
31 #include "grit/chromium_strings.h" 31 #include "grit/chromium_strings.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
33 #include "grit/locale_settings.h" 33 #include "grit/locale_settings.h"
34 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
35 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
36 36
37 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
38 #include "chrome/browser/chromeos/login/user_manager.h" 38 #include "chrome/browser/chromeos/login/user_manager.h"
39 #include "chrome/browser/dom_ui/web_ui_util.h" 39 #include "chrome/browser/webui/web_ui_util.h"
40 #include "third_party/skia/include/core/SkBitmap.h" 40 #include "third_party/skia/include/core/SkBitmap.h"
41 #endif // defined(OS_CHROMEOS) 41 #endif // defined(OS_CHROMEOS)
42 #if defined(TOOLKIT_GTK) 42 #if defined(TOOLKIT_GTK)
43 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 43 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
44 #endif // defined(TOOLKIT_GTK) 44 #endif // defined(TOOLKIT_GTK)
45 45
46 PersonalOptionsHandler::PersonalOptionsHandler() { 46 PersonalOptionsHandler::PersonalOptionsHandler() {
47 } 47 }
48 48
49 PersonalOptionsHandler::~PersonalOptionsHandler() { 49 PersonalOptionsHandler::~PersonalOptionsHandler() {
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 const SkBitmap& account_picture = 394 const SkBitmap& account_picture =
395 chromeos::UserManager::Get()->logged_in_user().image(); 395 chromeos::UserManager::Get()->logged_in_user().image();
396 396
397 if (!account_picture.isNull()) { 397 if (!account_picture.isNull()) {
398 StringValue data_url(web_ui_util::GetImageDataUrl(account_picture)); 398 StringValue data_url(web_ui_util::GetImageDataUrl(account_picture));
399 web_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture", 399 web_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture",
400 data_url); 400 data_url);
401 } 401 }
402 } 402 }
403 #endif 403 #endif
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/options_ui.h ('k') | chrome/browser/dom_ui/plugins_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698