| 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_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ | 5 #ifndef ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ |
| 6 #define ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ | 6 #define ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "base/basictypes.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "third_party/skia/include/core/SkColor.h" | 13 #include "third_party/skia/include/core/SkColor.h" |
| 14 #include "ui/aura/window_observer.h" | 14 #include "ui/aura/window_observer.h" |
| 15 | 15 |
| 16 namespace ui { | 16 namespace ui { |
| 17 class Layer; | 17 class Layer; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace ash { | 20 namespace ash { |
| 21 | 21 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 43 aura::Window* root_window_; // not owned | 43 aura::Window* root_window_; // not owned |
| 44 | 44 |
| 45 scoped_ptr<ui::Layer> layer_; | 45 scoped_ptr<ui::Layer> layer_; |
| 46 | 46 |
| 47 DISALLOW_COPY_AND_ASSIGN(SystemBackgroundController); | 47 DISALLOW_COPY_AND_ASSIGN(SystemBackgroundController); |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 } // namespace ash | 50 } // namespace ash |
| 51 | 51 |
| 52 #endif // ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_H_ | 52 #endif // ASH_WM_SYSTEM_BACKGROUND_CONTROLLER_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