| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_DISPLAY_SCREEN_ASH_H_ | 5 #ifndef ASH_DISPLAY_SCREEN_ASH_H_ |
| 6 #define ASH_DISPLAY_SCREEN_ASH_H_ | 6 #define ASH_DISPLAY_SCREEN_ASH_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 9 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/macros.h" |
| 10 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
| 11 #include "ui/gfx/display_observer.h" | 14 #include "ui/gfx/display_observer.h" |
| 12 #include "ui/gfx/screen.h" | 15 #include "ui/gfx/screen.h" |
| 13 | 16 |
| 14 namespace gfx { | 17 namespace gfx { |
| 15 class Rect; | 18 class Rect; |
| 16 } | 19 } |
| 17 | 20 |
| 18 namespace ash { | 21 namespace ash { |
| 19 namespace internal { | 22 namespace internal { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 gfx::Screen* CloneForShutdown(); | 56 gfx::Screen* CloneForShutdown(); |
| 54 | 57 |
| 55 base::ObserverList<gfx::DisplayObserver> observers_; | 58 base::ObserverList<gfx::DisplayObserver> observers_; |
| 56 | 59 |
| 57 DISALLOW_COPY_AND_ASSIGN(ScreenAsh); | 60 DISALLOW_COPY_AND_ASSIGN(ScreenAsh); |
| 58 }; | 61 }; |
| 59 | 62 |
| 60 } // namespace ash | 63 } // namespace ash |
| 61 | 64 |
| 62 #endif // ASH_DISPLAY_SCREEN_ASH_H_ | 65 #endif // ASH_DISPLAY_SCREEN_ASH_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1540753002:
Switch to standard integer types in ash/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master