| 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/material_design/material_design_controller.h" | |
| 8 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
| 9 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 10 #include "ash/shelf/wm_shelf.h" | 9 #include "ash/shelf/wm_shelf.h" |
| 11 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 12 #include "ash/system/ime_menu/ime_menu_tray.h" | 11 #include "ash/system/ime_menu/ime_menu_tray.h" |
| 13 #include "ash/system/overview/overview_button_tray.h" | 12 #include "ash/system/overview/overview_button_tray.h" |
| 14 #include "ash/system/palette/palette_tray.h" | 13 #include "ash/system/palette/palette_tray.h" |
| 15 #include "ash/system/palette/palette_utils.h" | 14 #include "ash/system/palette/palette_utils.h" |
| 16 #include "ash/system/session/logout_button_tray.h" | 15 #include "ash/system/session/logout_button_tray.h" |
| 17 #include "ash/system/status_area_widget_delegate.h" | 16 #include "ash/system/status_area_widget_delegate.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 system_tray_->SchedulePaint(); | 164 system_tray_->SchedulePaint(); |
| 166 virtual_keyboard_tray_->SchedulePaint(); | 165 virtual_keyboard_tray_->SchedulePaint(); |
| 167 logout_button_tray_->SchedulePaint(); | 166 logout_button_tray_->SchedulePaint(); |
| 168 ime_menu_tray_->SchedulePaint(); | 167 ime_menu_tray_->SchedulePaint(); |
| 169 if (palette_tray_) | 168 if (palette_tray_) |
| 170 palette_tray_->SchedulePaint(); | 169 palette_tray_->SchedulePaint(); |
| 171 overview_button_tray_->SchedulePaint(); | 170 overview_button_tray_->SchedulePaint(); |
| 172 } | 171 } |
| 173 | 172 |
| 174 const ui::NativeTheme* StatusAreaWidget::GetNativeTheme() const { | 173 const ui::NativeTheme* StatusAreaWidget::GetNativeTheme() const { |
| 175 return MaterialDesignController::IsShelfMaterial() | 174 return ui::NativeThemeDarkAura::instance(); |
| 176 ? ui::NativeThemeDarkAura::instance() | |
| 177 : Widget::GetNativeTheme(); | |
| 178 } | 175 } |
| 179 | 176 |
| 180 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) { | 177 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) { |
| 181 Widget::OnNativeWidgetActivationChanged(active); | 178 Widget::OnNativeWidgetActivationChanged(active); |
| 182 if (active) | 179 if (active) |
| 183 status_area_widget_delegate_->SetPaneFocusAndFocusDefault(); | 180 status_area_widget_delegate_->SetPaneFocusAndFocusDefault(); |
| 184 } | 181 } |
| 185 | 182 |
| 186 void StatusAreaWidget::UpdateShelfItemBackground(SkColor color) { | 183 void StatusAreaWidget::UpdateShelfItemBackground(SkColor color) { |
| 187 web_notification_tray_->UpdateShelfItemBackground(color); | 184 web_notification_tray_->UpdateShelfItemBackground(color); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 ime_menu_tray_ = new ImeMenuTray(wm_shelf_); | 230 ime_menu_tray_ = new ImeMenuTray(wm_shelf_); |
| 234 status_area_widget_delegate_->AddTray(ime_menu_tray_); | 231 status_area_widget_delegate_->AddTray(ime_menu_tray_); |
| 235 } | 232 } |
| 236 | 233 |
| 237 void StatusAreaWidget::AddOverviewButtonTray() { | 234 void StatusAreaWidget::AddOverviewButtonTray() { |
| 238 overview_button_tray_ = new OverviewButtonTray(wm_shelf_); | 235 overview_button_tray_ = new OverviewButtonTray(wm_shelf_); |
| 239 status_area_widget_delegate_->AddTray(overview_button_tray_); | 236 status_area_widget_delegate_->AddTray(overview_button_tray_); |
| 240 } | 237 } |
| 241 | 238 |
| 242 } // namespace ash | 239 } // namespace ash |
| OLD | NEW |