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/ime/tray_ime.h" | 5 #include "ash/system/ime/tray_ime.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/shelf/shelf_layout_manager.h" | |
11 #include "ash/shelf/shelf_widget.h" | |
Mr4D (OOO till 08-26)
2013/03/02 02:02:12
Sure you need this?
Harry McCleave
2013/03/04 02:47:41
Done.
| |
10 #include "ash/shell.h" | 12 #include "ash/shell.h" |
11 #include "ash/system/tray/hover_highlight_view.h" | 13 #include "ash/system/tray/hover_highlight_view.h" |
12 #include "ash/system/tray/system_tray.h" | 14 #include "ash/system/tray/system_tray.h" |
13 #include "ash/system/tray/system_tray_delegate.h" | 15 #include "ash/system/tray/system_tray_delegate.h" |
14 #include "ash/system/tray/system_tray_notifier.h" | 16 #include "ash/system/tray/system_tray_notifier.h" |
15 #include "ash/system/tray/tray_constants.h" | 17 #include "ash/system/tray/tray_constants.h" |
16 #include "ash/system/tray/tray_details_view.h" | 18 #include "ash/system/tray/tray_details_view.h" |
17 #include "ash/system/tray/tray_item_more.h" | 19 #include "ash/system/tray/tray_item_more.h" |
18 #include "ash/system/tray/tray_item_view.h" | 20 #include "ash/system/tray/tray_item_view.h" |
19 #include "ash/system/tray/tray_notification_view.h" | 21 #include "ash/system/tray/tray_notification_view.h" |
20 #include "ash/wm/shelf_layout_manager.h" | |
21 #include "base/logging.h" | 22 #include "base/logging.h" |
22 #include "base/timer.h" | 23 #include "base/timer.h" |
23 #include "base/utf_string_conversions.h" | 24 #include "base/utf_string_conversions.h" |
24 #include "grit/ash_resources.h" | 25 #include "grit/ash_resources.h" |
25 #include "grit/ash_strings.h" | 26 #include "grit/ash_strings.h" |
26 #include "ui/base/l10n/l10n_util.h" | 27 #include "ui/base/l10n/l10n_util.h" |
27 #include "ui/base/resource/resource_bundle.h" | 28 #include "ui/base/resource/resource_bundle.h" |
28 #include "ui/gfx/font.h" | 29 #include "ui/gfx/font.h" |
29 #include "ui/gfx/image/image.h" | 30 #include "ui/gfx/image/image.h" |
30 #include "ui/views/controls/label.h" | 31 #include "ui/views/controls/label.h" |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
343 } else if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() || | 344 } else if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() || |
344 !message_shown_) { | 345 !message_shown_) { |
345 ShowNotificationView(); | 346 ShowNotificationView(); |
346 message_shown_ = true; | 347 message_shown_ = true; |
347 } | 348 } |
348 } | 349 } |
349 } | 350 } |
350 | 351 |
351 } // namespace internal | 352 } // namespace internal |
352 } // namespace ash | 353 } // namespace ash |
OLD | NEW |