| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef ASH_COMMON_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_ | 
| 6 #define ASH_COMMON_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_ | 
| 7 | 7 | 
| 8 #include "ash/common/system/tray/actionable_view.h" | 8 #include "ash/system/tray/actionable_view.h" | 
| 9 #include "ash/common/system/tray/tray_popup_item_style.h" | 9 #include "ash/system/tray/tray_popup_item_style.h" | 
| 10 #include "base/macros.h" | 10 #include "base/macros.h" | 
| 11 #include "ui/gfx/font.h" | 11 #include "ui/gfx/font.h" | 
| 12 #include "ui/gfx/text_constants.h" | 12 #include "ui/gfx/text_constants.h" | 
| 13 | 13 | 
| 14 namespace views { | 14 namespace views { | 
| 15 class ImageView; | 15 class ImageView; | 
| 16 class Label; | 16 class Label; | 
| 17 class BoxLayout; | 17 class BoxLayout; | 
| 18 } | 18 } | 
| 19 | 19 | 
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 185   bool expandable_ = false; | 185   bool expandable_ = false; | 
| 186   int custom_height_ = 0;  // Not used in material design. | 186   int custom_height_ = 0;  // Not used in material design. | 
| 187   AccessibilityState accessibility_state_ = AccessibilityState::DEFAULT; | 187   AccessibilityState accessibility_state_ = AccessibilityState::DEFAULT; | 
| 188   base::string16 tooltip_; | 188   base::string16 tooltip_; | 
| 189 | 189 | 
| 190   DISALLOW_COPY_AND_ASSIGN(HoverHighlightView); | 190   DISALLOW_COPY_AND_ASSIGN(HoverHighlightView); | 
| 191 }; | 191 }; | 
| 192 | 192 | 
| 193 }  // namespace ash | 193 }  // namespace ash | 
| 194 | 194 | 
| 195 #endif  // ASH_COMMON_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_ | 195 #endif  // ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_ | 
| OLD | NEW | 
|---|