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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/system/tray/system_tray.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 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/shell/window_type_launcher.cc ('k') | ash/system/tray/tray_item_view.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/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell/panel_window.h" 8 #include "ash/shell/panel_window.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/system/audio/tray_volume.h" 10 #include "ash/system/audio/tray_volume.h"
11 #include "ash/system/bluetooth/tray_bluetooth.h" 11 #include "ash/system/bluetooth/tray_bluetooth.h"
12 #include "ash/system/brightness/tray_brightness.h" 12 #include "ash/system/brightness/tray_brightness.h"
13 #include "ash/system/date/tray_date.h" 13 #include "ash/system/date/tray_date.h"
14 #include "ash/system/drive/tray_drive.h" 14 #include "ash/system/drive/tray_drive.h"
15 #include "ash/system/ime/tray_ime.h" 15 #include "ash/system/ime/tray_ime.h"
16 #include "ash/system/network/tray_network.h" 16 #include "ash/system/network/tray_network.h"
17 #include "ash/system/power/power_status_observer.h" 17 #include "ash/system/power/power_status_observer.h"
18 #include "ash/system/power/power_supply_status.h" 18 #include "ash/system/power/power_supply_status.h"
19 #include "ash/system/power/tray_power.h" 19 #include "ash/system/power/tray_power.h"
20 #include "ash/system/settings/tray_settings.h" 20 #include "ash/system/settings/tray_settings.h"
21 #include "ash/system/tray/tray_empty.h"
22 #include "ash/system/tray/tray_constants.h"
23 #include "ash/system/tray/system_tray_delegate.h" 21 #include "ash/system/tray/system_tray_delegate.h"
24 #include "ash/system/tray/system_tray_item.h" 22 #include "ash/system/tray/system_tray_item.h"
25 #include "ash/system/tray/system_tray_widget_delegate.h" 23 #include "ash/system/tray/system_tray_widget_delegate.h"
24 #include "ash/system/tray/tray_constants.h"
25 #include "ash/system/tray/tray_empty.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/tray_user.h" 30 #include "ash/system/user/tray_user.h"
30 #include "ash/system/user/login_status.h"
31 #include "ash/wm/shadow_types.h" 31 #include "ash/wm/shadow_types.h"
32 #include "ash/wm/shelf_layout_manager.h" 32 #include "ash/wm/shelf_layout_manager.h"
33 #include "ash/wm/window_animations.h" 33 #include "ash/wm/window_animations.h"
34 #include "base/i18n/rtl.h" 34 #include "base/i18n/rtl.h"
35 #include "base/logging.h" 35 #include "base/logging.h"
36 #include "base/message_loop.h" 36 #include "base/message_loop.h"
37 #include "base/message_pump_observer.h" 37 #include "base/message_pump_observer.h"
38 #include "base/timer.h" 38 #include "base/timer.h"
39 #include "base/utf_string_conversions.h" 39 #include "base/utf_string_conversions.h"
40 #include "grit/ash_strings.h" 40 #include "grit/ash_strings.h"
41 #include "third_party/skia/include/core/SkCanvas.h" 41 #include "third_party/skia/include/core/SkCanvas.h"
42 #include "third_party/skia/include/core/SkColor.h" 42 #include "third_party/skia/include/core/SkColor.h"
43 #include "third_party/skia/include/core/SkPaint.h" 43 #include "third_party/skia/include/core/SkPaint.h"
44 #include "third_party/skia/include/core/SkPath.h" 44 #include "third_party/skia/include/core/SkPath.h"
45 #include "third_party/skia/include/effects/SkBlurImageFilter.h" 45 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
46 #include "ui/aura/root_window.h" 46 #include "ui/aura/root_window.h"
47 #include "ui/base/accessibility/accessible_view_state.h"
47 #include "ui/base/events.h" 48 #include "ui/base/events.h"
48 #include "ui/base/accessibility/accessible_view_state.h"
49 #include "ui/base/l10n/l10n_util.h" 49 #include "ui/base/l10n/l10n_util.h"
50 #include "ui/compositor/layer.h"
50 #include "ui/gfx/canvas.h" 51 #include "ui/gfx/canvas.h"
51 #include "ui/gfx/compositor/layer.h"
52 #include "ui/gfx/screen.h" 52 #include "ui/gfx/screen.h"
53 #include "ui/gfx/skia_util.h" 53 #include "ui/gfx/skia_util.h"
54 #include "ui/views/border.h" 54 #include "ui/views/border.h"
55 #include "ui/views/bubble/bubble_border.h" 55 #include "ui/views/bubble/bubble_border.h"
56 #include "ui/views/bubble/bubble_delegate.h" 56 #include "ui/views/bubble/bubble_delegate.h"
57 #include "ui/views/bubble/bubble_frame_view.h" 57 #include "ui/views/bubble/bubble_frame_view.h"
58 #include "ui/views/controls/label.h" 58 #include "ui/views/controls/label.h"
59 #include "ui/views/layout/box_layout.h"
59 #include "ui/views/layout/fill_layout.h" 60 #include "ui/views/layout/fill_layout.h"
60 #include "ui/views/layout/box_layout.h"
61 #include "ui/views/view.h" 61 #include "ui/views/view.h"
62 #include "ui/views/widget/widget.h" 62 #include "ui/views/widget/widget.h"
63 63
64 namespace ash { 64 namespace ash {
65 65
66 namespace { 66 namespace {
67 67
68 const int kPaddingFromRightEdgeOfScreen = 15; 68 const int kPaddingFromRightEdgeOfScreen = 15;
69 const int kPaddingFromBottomOfScreen = 10; 69 const int kPaddingFromBottomOfScreen = 10;
70 70
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 canvas->DrawFocusRect(container_->bounds()); 852 canvas->DrawFocusRect(container_->bounds());
853 } 853 }
854 854
855 void SystemTray::UpdateBackground(int alpha) { 855 void SystemTray::UpdateBackground(int alpha) {
856 background_->set_alpha(hide_background_animator_.alpha() + 856 background_->set_alpha(hide_background_animator_.alpha() +
857 hover_background_animator_.alpha()); 857 hover_background_animator_.alpha());
858 SchedulePaint(); 858 SchedulePaint();
859 } 859 }
860 860
861 } // namespace ash 861 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/system/tray/tray_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698