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.h" | 5 #include "ash/system/status_area_widget.h" |
6 | 6 |
7 #include "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
8 #include "ash/common/shell_window_ids.h" | 8 #include "ash/common/shell_window_ids.h" |
9 #include "ash/common/system/tray/system_tray_delegate.h" | 9 #include "ash/common/system/tray/system_tray_delegate.h" |
10 #include "ash/common/wm_root_window_controller.h" | 10 #include "ash/common/wm_root_window_controller.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 params.name = "StatusAreaWidget"; | 42 params.name = "StatusAreaWidget"; |
43 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 43 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
44 status_container->GetRootWindowController() | 44 status_container->GetRootWindowController() |
45 ->ConfigureWidgetInitParamsForContainer( | 45 ->ConfigureWidgetInitParamsForContainer( |
46 this, status_container->GetShellWindowId(), ¶ms); | 46 this, status_container->GetShellWindowId(), ¶ms); |
47 Init(params); | 47 Init(params); |
48 set_focus_on_creation(false); | 48 set_focus_on_creation(false); |
49 SetContentsView(status_area_widget_delegate_); | 49 SetContentsView(status_area_widget_delegate_); |
50 } | 50 } |
51 | 51 |
52 StatusAreaWidget::~StatusAreaWidget() { | 52 StatusAreaWidget::~StatusAreaWidget() {} |
53 } | |
54 | 53 |
55 void StatusAreaWidget::CreateTrayViews() { | 54 void StatusAreaWidget::CreateTrayViews() { |
56 AddOverviewButtonTray(); | 55 AddOverviewButtonTray(); |
57 AddSystemTray(); | 56 AddSystemTray(); |
58 AddWebNotificationTray(); | 57 AddWebNotificationTray(); |
59 #if defined(OS_CHROMEOS) | 58 #if defined(OS_CHROMEOS) |
60 AddLogoutButtonTray(); | 59 AddLogoutButtonTray(); |
61 AddVirtualKeyboardTray(); | 60 AddVirtualKeyboardTray(); |
62 #endif | 61 #endif |
63 | 62 |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); | 200 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); |
202 #if defined(OS_CHROMEOS) | 201 #if defined(OS_CHROMEOS) |
203 if (logout_button_tray_) | 202 if (logout_button_tray_) |
204 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); | 203 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); |
205 #endif | 204 #endif |
206 if (overview_button_tray_) | 205 if (overview_button_tray_) |
207 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); | 206 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); |
208 } | 207 } |
209 | 208 |
210 } // namespace ash | 209 } // namespace ash |
OLD | NEW |