OLD | NEW |
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/status_area_widget_delegate.h" | 5 #include "ash/system/status_area_widget_delegate.h" |
6 | 6 |
7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
8 #include "ash/focus_cycler.h" | 8 #include "ash/focus_cycler.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "grit/ui_resources.h" | 12 #include "grit/ui_resources.h" |
13 #include "ui/aura/root_window.h" | 13 #include "ui/aura/root_window.h" |
14 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
15 #include "ui/gfx/canvas.h" | 15 #include "ui/gfx/canvas.h" |
16 #include "ui/gfx/image/image.h" | 16 #include "ui/gfx/image/image.h" |
17 #include "ui/views/accessible_pane_view.h" | 17 #include "ui/views/accessible_pane_view.h" |
18 #include "ui/views/layout/grid_layout.h" | 18 #include "ui/views/layout/grid_layout.h" |
19 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 int kTraySpacing = 1; | 23 int kTraySpacing = 8; |
24 | 24 |
25 } // namespace | 25 } // namespace |
26 | 26 |
27 namespace ash { | 27 namespace ash { |
28 namespace internal { | 28 namespace internal { |
29 | 29 |
30 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate() | 30 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate() |
31 : focus_cycler_for_testing_(NULL), | 31 : focus_cycler_for_testing_(NULL), |
32 alignment_(SHELF_ALIGNMENT_BOTTOM) { | 32 alignment_(SHELF_ALIGNMENT_BOTTOM) { |
33 } | 33 } |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 UpdateWidgetSize(); | 118 UpdateWidgetSize(); |
119 } | 119 } |
120 | 120 |
121 void StatusAreaWidgetDelegate::UpdateWidgetSize() { | 121 void StatusAreaWidgetDelegate::UpdateWidgetSize() { |
122 if (GetWidget()) | 122 if (GetWidget()) |
123 GetWidget()->SetSize(GetPreferredSize()); | 123 GetWidget()->SetSize(GetPreferredSize()); |
124 } | 124 } |
125 | 125 |
126 } // namespace internal | 126 } // namespace internal |
127 } // namespace ash | 127 } // namespace ash |
OLD | NEW |