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

Side by Side Diff: ash/system/user/tray_user.cc

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « ash/system/user/login_status.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/user/tray_user.h" 5 #include "ash/system/user/tray_user.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <climits> 8 #include <climits>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/popup_message.h" 11 #include "ash/popup_message.h"
12 #include "ash/session_state_delegate.h" 12 #include "ash/session_state_delegate.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/shell_delegate.h" 14 #include "ash/shell_delegate.h"
15 #include "ash/system/tray/system_tray.h" 15 #include "ash/system/tray/system_tray.h"
16 #include "ash/system/tray/system_tray_delegate.h" 16 #include "ash/system/tray/system_tray_delegate.h"
17 #include "ash/system/tray/system_tray_notifier.h" 17 #include "ash/system/tray/system_tray_notifier.h"
18 #include "ash/system/tray/tray_constants.h" 18 #include "ash/system/tray/tray_constants.h"
19 #include "ash/system/tray/tray_item_view.h" 19 #include "ash/system/tray/tray_item_view.h"
20 #include "ash/system/tray/tray_popup_label_button.h" 20 #include "ash/system/tray/tray_popup_label_button.h"
21 #include "ash/system/tray/tray_popup_label_button_border.h" 21 #include "ash/system/tray/tray_popup_label_button_border.h"
22 #include "ash/system/tray/tray_utils.h" 22 #include "ash/system/tray/tray_utils.h"
23 #include "base/i18n/rtl.h" 23 #include "base/i18n/rtl.h"
24 #include "base/logging.h" 24 #include "base/logging.h"
25 #include "base/memory/scoped_vector.h" 25 #include "base/memory/scoped_vector.h"
26 #include "base/string16.h" 26 #include "base/string16.h"
27 #include "base/string_util.h" 27 #include "base/string_util.h"
28 #include "base/utf_string_conversions.h" 28 #include "base/strings/utf_string_conversions.h"
29 #include "grit/ash_resources.h" 29 #include "grit/ash_resources.h"
30 #include "grit/ash_strings.h" 30 #include "grit/ash_strings.h"
31 #include "skia/ext/image_operations.h" 31 #include "skia/ext/image_operations.h"
32 #include "third_party/skia/include/core/SkCanvas.h" 32 #include "third_party/skia/include/core/SkCanvas.h"
33 #include "third_party/skia/include/core/SkPaint.h" 33 #include "third_party/skia/include/core/SkPaint.h"
34 #include "third_party/skia/include/core/SkPath.h" 34 #include "third_party/skia/include/core/SkPath.h"
35 #include "ui/aura/window.h" 35 #include "ui/aura/window.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/base/range/range.h" 37 #include "ui/base/range/range.h"
38 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 if (avatar_) { 1220 if (avatar_) {
1221 avatar_->SetImage( 1221 avatar_->SetImage(
1222 ash::Shell::GetInstance()->session_state_delegate()->GetUserImage( 1222 ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
1223 multiprofile_index_), 1223 multiprofile_index_),
1224 gfx::Size(kUserIconSize, kUserIconSize)); 1224 gfx::Size(kUserIconSize, kUserIconSize));
1225 } 1225 }
1226 } 1226 }
1227 1227
1228 } // namespace internal 1228 } // namespace internal
1229 } // namespace ash 1229 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/login_status.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698