| 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 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_WIDGET_DELEGATE_H_ | 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_WIDGET_DELEGATE_H_ |
| 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_WIDGET_DELEGATE_H_ | 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_WIDGET_DELEGATE_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "ash/ash_export.h" | 9 #include "ash/ash_export.h" |
| 10 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 private: | 40 private: |
| 41 const FocusCycler* focus_cycler_for_testing_; | 41 const FocusCycler* focus_cycler_for_testing_; |
| 42 | 42 |
| 43 DISALLOW_COPY_AND_ASSIGN(StatusAreaView); | 43 DISALLOW_COPY_AND_ASSIGN(StatusAreaView); |
| 44 }; | 44 }; |
| 45 | 45 |
| 46 } // namespace internal | 46 } // namespace internal |
| 47 } // namespace ash | 47 } // namespace ash |
| 48 | 48 |
| 49 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_WIDGET_DELEGATE_H_ | 49 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_WIDGET_DELEGATE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10202012:
Revert 133691 because it accidentally reverted revs 133686 and 133684. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/