| 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/common/system/chromeos/bluetooth/tray_bluetooth.h" | 5 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_delegate.h" |
| 9 #include "ash/common/system/tray/fixed_sized_scroll_view.h" | 9 #include "ash/common/system/tray/fixed_sized_scroll_view.h" |
| 10 #include "ash/common/system/tray/hover_highlight_view.h" | 10 #include "ash/common/system/tray/hover_highlight_view.h" |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 | 160 |
| 161 if (!UseMd()) | 161 if (!UseMd()) |
| 162 return; | 162 return; |
| 163 | 163 |
| 164 SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate(); | 164 SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate(); |
| 165 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle(); | 165 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle(); |
| 166 | 166 |
| 167 SetImage(gfx::CreateVectorIcon(delegate->GetBluetoothEnabled() | 167 SetImage(gfx::CreateVectorIcon(delegate->GetBluetoothEnabled() |
| 168 ? kSystemMenuBluetoothIcon | 168 ? kSystemMenuBluetoothIcon |
| 169 : kSystemMenuBluetoothDisabledIcon, | 169 : kSystemMenuBluetoothDisabledIcon, |
| 170 style->GetForegroundColor())); | 170 style->GetIconColor())); |
| 171 } | 171 } |
| 172 | 172 |
| 173 private: | 173 private: |
| 174 DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView); | 174 DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView); |
| 175 }; | 175 }; |
| 176 | 176 |
| 177 class BluetoothDetailedView : public TrayDetailsView { | 177 class BluetoothDetailedView : public TrayDetailsView { |
| 178 public: | 178 public: |
| 179 BluetoothDetailedView(SystemTrayItem* owner, LoginStatus login) | 179 BluetoothDetailedView(SystemTrayItem* owner, LoginStatus login) |
| 180 : TrayDetailsView(owner), | 180 : TrayDetailsView(owner), |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 615 detailed_->Update(); | 615 detailed_->Update(); |
| 616 } | 616 } |
| 617 | 617 |
| 618 void TrayBluetooth::OnBluetoothDiscoveringChanged() { | 618 void TrayBluetooth::OnBluetoothDiscoveringChanged() { |
| 619 if (!detailed_) | 619 if (!detailed_) |
| 620 return; | 620 return; |
| 621 detailed_->Update(); | 621 detailed_->Update(); |
| 622 } | 622 } |
| 623 | 623 |
| 624 } // namespace ash | 624 } // namespace ash |
| OLD | NEW |