| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_CHROMEOS_PALETTE_COMMON_PALETTE_TOOL_H_ | 5 #ifndef ASH_SYSTEM_PALETTE_COMMON_PALETTE_TOOL_H_ |
| 6 #define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_COMMON_PALETTE_TOOL_H_ | 6 #define ASH_SYSTEM_PALETTE_COMMON_PALETTE_TOOL_H_ |
| 7 | 7 |
| 8 #include "ash/common/system/chromeos/palette/palette_tool.h" | 8 #include "ash/system/palette/palette_tool.h" |
| 9 #include "ash/common/system/tray/view_click_listener.h" | 9 #include "ash/system/tray/view_click_listener.h" |
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
| 11 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 struct VectorIcon; | 14 struct VectorIcon; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 | 18 |
| 19 class HoverHighlightView; | 19 class HoverHighlightView; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 44 | 44 |
| 45 // start_time_ is initialized when the tool becomes active. | 45 // start_time_ is initialized when the tool becomes active. |
| 46 // Used for recording UMA metrics. | 46 // Used for recording UMA metrics. |
| 47 base::TimeTicks start_time_; | 47 base::TimeTicks start_time_; |
| 48 | 48 |
| 49 DISALLOW_COPY_AND_ASSIGN(CommonPaletteTool); | 49 DISALLOW_COPY_AND_ASSIGN(CommonPaletteTool); |
| 50 }; | 50 }; |
| 51 | 51 |
| 52 } // namespace ash | 52 } // namespace ash |
| 53 | 53 |
| 54 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_COMMON_PALETTE_TOOL_H_ | 54 #endif // ASH_SYSTEM_PALETTE_COMMON_PALETTE_TOOL_H_ |
| OLD | NEW |