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

Side by Side Diff: chrome/browser/chromeos/login/user_controller.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/chromeos/login/user_controller.h" 5 #include "chrome/browser/chromeos/login/user_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 11 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
12 #include "chrome/browser/chromeos/login/existing_user_view.h" 12 #include "chrome/browser/chromeos/login/existing_user_view.h"
13 #include "chrome/browser/chromeos/login/guest_user_view.h" 13 #include "chrome/browser/chromeos/login/guest_user_view.h"
14 #include "chrome/browser/chromeos/login/helper.h" 14 #include "chrome/browser/chromeos/login/helper.h"
15 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" 15 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
16 #include "chrome/browser/chromeos/login/user_view.h" 16 #include "chrome/browser/chromeos/login/user_view.h"
17 #include "chrome/browser/chromeos/login/username_view.h" 17 #include "chrome/browser/chromeos/login/username_view.h"
18 #include "chrome/browser/chromeos/login/wizard_controller.h" 18 #include "chrome/browser/chromeos/login/wizard_controller.h"
19 #include "third_party/cros/chromeos_wm_ipc_enums.h" 19 #include "third_party/cros/chromeos_wm_ipc_enums.h"
20 #include "gfx/canvas.h"
21 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
22 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/gfx/canvas.h"
25 #include "views/background.h" 25 #include "views/background.h"
26 #include "views/controls/button/native_button.h" 26 #include "views/controls/button/native_button.h"
27 #include "views/controls/label.h" 27 #include "views/controls/label.h"
28 #include "views/controls/throbber.h" 28 #include "views/controls/throbber.h"
29 #include "views/layout/grid_layout.h" 29 #include "views/layout/grid_layout.h"
30 #include "views/painter.h" 30 #include "views/painter.h"
31 #include "views/screen.h" 31 #include "views/screen.h"
32 #include "views/widget/root_view.h" 32 #include "views/widget/root_view.h"
33 #include "views/widget/widget_gtk.h" 33 #include "views/widget/widget_gtk.h"
34 34
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 std::wstring UserController::GetNameTooltip() const { 479 std::wstring UserController::GetNameTooltip() const {
480 if (is_new_user_) 480 if (is_new_user_)
481 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_ADD_USER)); 481 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_ADD_USER));
482 else if (is_guest_) 482 else if (is_guest_)
483 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON)); 483 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON));
484 else 484 else
485 return UTF8ToWide(user_.GetNameTooltip()); 485 return UTF8ToWide(user_.GetNameTooltip());
486 } 486 }
487 487
488 } // namespace chromeos 488 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/shutdown_button.cc ('k') | chrome/browser/chromeos/login/user_image_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698