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

Side by Side Diff: ash/system/tray/system_tray.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/status_area_widget_delegate.cc ('k') | ash/system/tray/system_tray_unittest.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/tray/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell/panel_window.h" 10 #include "ash/shell/panel_window.h"
(...skipping 12 matching lines...) Expand all
23 #include "ash/system/tray/system_tray_item.h" 23 #include "ash/system/tray/system_tray_item.h"
24 #include "ash/system/tray/tray_bubble_wrapper.h" 24 #include "ash/system/tray/tray_bubble_wrapper.h"
25 #include "ash/system/tray/tray_constants.h" 25 #include "ash/system/tray/tray_constants.h"
26 #include "ash/system/tray_accessibility.h" 26 #include "ash/system/tray_accessibility.h"
27 #include "ash/system/tray_caps_lock.h" 27 #include "ash/system/tray_caps_lock.h"
28 #include "ash/system/tray_update.h" 28 #include "ash/system/tray_update.h"
29 #include "ash/system/user/login_status.h" 29 #include "ash/system/user/login_status.h"
30 #include "ash/system/user/tray_user.h" 30 #include "ash/system/user/tray_user.h"
31 #include "base/command_line.h" 31 #include "base/command_line.h"
32 #include "base/logging.h" 32 #include "base/logging.h"
33 #include "base/strings/utf_string_conversions.h"
33 #include "base/timer.h" 34 #include "base/timer.h"
34 #include "base/utf_string_conversions.h"
35 #include "grit/ash_strings.h" 35 #include "grit/ash_strings.h"
36 #include "ui/aura/root_window.h" 36 #include "ui/aura/root_window.h"
37 #include "ui/base/events/event_constants.h" 37 #include "ui/base/events/event_constants.h"
38 #include "ui/base/l10n/l10n_util.h" 38 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/compositor/layer.h" 39 #include "ui/compositor/layer.h"
40 #include "ui/gfx/canvas.h" 40 #include "ui/gfx/canvas.h"
41 #include "ui/gfx/screen.h" 41 #include "ui/gfx/screen.h"
42 #include "ui/gfx/skia_util.h" 42 #include "ui/gfx/skia_util.h"
43 #include "ui/views/border.h" 43 #include "ui/views/border.h"
44 #include "ui/views/controls/label.h" 44 #include "ui/views/controls/label.h"
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 ConvertPointToWidget(this, &point); 576 ConvertPointToWidget(this, &point);
577 arrow_offset = point.x(); 577 arrow_offset = point.x();
578 } 578 }
579 } 579 }
580 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); 580 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
581 } 581 }
582 return true; 582 return true;
583 } 583 }
584 584
585 } // namespace ash 585 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698