Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Side by Side Diff: ash/display/display_color_manager_chromeos.h

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
6 #define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ 6 #define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
7 7
8 #include <stdint.h>
9
8 #include <map> 10 #include <map>
9 #include <vector> 11 #include <vector>
10 12
11 #include "ash/ash_export.h" 13 #include "ash/ash_export.h"
12 #include "base/basictypes.h"
13 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/macros.h"
14 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
15 #include "ui/display/chromeos/display_configurator.h" 17 #include "ui/display/chromeos/display_configurator.h"
16 #include "ui/gfx/display.h" 18 #include "ui/gfx/display.h"
17 #include "ui/gfx/display_observer.h" 19 #include "ui/gfx/display_observer.h"
18 20
19 namespace base { 21 namespace base {
20 class SequencedWorkerPool; 22 class SequencedWorkerPool;
21 } 23 }
22 24
23 namespace ui { 25 namespace ui {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 ui::DisplayConfigurator* configurator_; 64 ui::DisplayConfigurator* configurator_;
63 std::map<int64_t, ColorCalibrationData*> calibration_map_; 65 std::map<int64_t, ColorCalibrationData*> calibration_map_;
64 base::SequencedWorkerPool* blocking_pool_; 66 base::SequencedWorkerPool* blocking_pool_;
65 67
66 DISALLOW_COPY_AND_ASSIGN(DisplayColorManager); 68 DISALLOW_COPY_AND_ASSIGN(DisplayColorManager);
67 }; 69 };
68 70
69 } // namespace ash 71 } // namespace ash
70 72
71 #endif // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_ 73 #endif // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_configurator_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698