| 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/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/focus_cycler.h" | 9 #include "ash/focus_cycler.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
| 12 #include "ash/system/tray/tray_constants.h" | 12 #include "ash/system/tray/tray_constants.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "ui/aura/window_event_dispatcher.h" | 14 #include "ui/aura/window_event_dispatcher.h" |
| 15 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 16 #include "ui/gfx/canvas.h" | 16 #include "ui/gfx/canvas.h" |
| 17 #include "ui/gfx/image/image.h" | 17 #include "ui/gfx/image/image.h" |
| 18 #include "ui/views/accessible_pane_view.h" | 18 #include "ui/views/accessible_pane_view.h" |
| 19 #include "ui/views/layout/grid_layout.h" | 19 #include "ui/views/layout/grid_layout.h" |
| 20 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 namespace internal { | |
| 24 namespace { | 23 namespace { |
| 25 | 24 |
| 26 const int kStatusTrayOffsetFromScreenEdge = 4; | 25 const int kStatusTrayOffsetFromScreenEdge = 4; |
| 27 | 26 |
| 28 } | 27 } |
| 29 | 28 |
| 30 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate() | 29 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate() |
| 31 : focus_cycler_for_testing_(NULL), | 30 : focus_cycler_for_testing_(NULL), |
| 32 alignment_(SHELF_ALIGNMENT_BOTTOM) { | 31 alignment_(SHELF_ALIGNMENT_BOTTOM) { |
| 33 // Allow the launcher to surrender the focus to another window upon | 32 // Allow the launcher to surrender the focus to another window upon |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 146 |
| 148 void StatusAreaWidgetDelegate::ChildVisibilityChanged(View* child) { | 147 void StatusAreaWidgetDelegate::ChildVisibilityChanged(View* child) { |
| 149 UpdateLayout(); | 148 UpdateLayout(); |
| 150 } | 149 } |
| 151 | 150 |
| 152 void StatusAreaWidgetDelegate::UpdateWidgetSize() { | 151 void StatusAreaWidgetDelegate::UpdateWidgetSize() { |
| 153 if (GetWidget()) | 152 if (GetWidget()) |
| 154 GetWidget()->SetSize(GetPreferredSize()); | 153 GetWidget()->SetSize(GetPreferredSize()); |
| 155 } | 154 } |
| 156 | 155 |
| 157 } // namespace internal | |
| 158 } // namespace ash | 156 } // namespace ash |
| OLD | NEW |