| 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/tray/system_tray_item.h" | 5 #include "ash/system/tray/system_tray_item.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/common/system/tray/system_tray_delegate.h" |
| 8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
| 9 #include "ash/system/tray/system_tray_delegate.h" | |
| 10 #include "ui/views/view.h" | 9 #include "ui/views/view.h" |
| 11 | 10 |
| 12 namespace ash { | 11 namespace ash { |
| 13 | 12 |
| 14 SystemTrayItem::SystemTrayItem(SystemTray* system_tray) | 13 SystemTrayItem::SystemTrayItem(SystemTray* system_tray) |
| 15 : system_tray_(system_tray), | 14 : system_tray_(system_tray), |
| 16 restore_focus_(false) { | 15 restore_focus_(false) { |
| 17 } | 16 } |
| 18 | 17 |
| 19 SystemTrayItem::~SystemTrayItem() { | 18 SystemTrayItem::~SystemTrayItem() { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 78 |
| 80 bool SystemTrayItem::ShouldHideArrow() const { | 79 bool SystemTrayItem::ShouldHideArrow() const { |
| 81 return false; | 80 return false; |
| 82 } | 81 } |
| 83 | 82 |
| 84 bool SystemTrayItem::ShouldShowShelf() const { | 83 bool SystemTrayItem::ShouldShowShelf() const { |
| 85 return true; | 84 return true; |
| 86 } | 85 } |
| 87 | 86 |
| 88 } // namespace ash | 87 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2056823002:
mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master