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

Side by Side Diff: ui/ozone/common/native_display_delegate_ozone.h

Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 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 UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ 5 #ifndef UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_
6 #define UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ 6 #define UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "ui/display/types/native_display_delegate.h" 10 #include "ui/display/types/native_display_delegate.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 bool SetColorCalibrationProfile( 44 bool SetColorCalibrationProfile(
45 const ui::DisplaySnapshot& output, 45 const ui::DisplaySnapshot& output,
46 ui::ColorCalibrationProfile new_profile) override; 46 ui::ColorCalibrationProfile new_profile) override;
47 bool SetGammaRamp(const ui::DisplaySnapshot& output, 47 bool SetGammaRamp(const ui::DisplaySnapshot& output,
48 const std::vector<GammaRampRGBEntry>& lut) override; 48 const std::vector<GammaRampRGBEntry>& lut) override;
49 49
50 void AddObserver(NativeDisplayObserver* observer) override; 50 void AddObserver(NativeDisplayObserver* observer) override;
51 void RemoveObserver(NativeDisplayObserver* observer) override; 51 void RemoveObserver(NativeDisplayObserver* observer) override;
52 52
53 private: 53 private:
54 ScopedVector<DisplaySnapshot> displays_; 54 std::vector<scoped_ptr<DisplaySnapshot>> displays_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone); 56 DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateOzone);
57 }; 57 };
58 58
59 } // namespace ui 59 } // namespace ui
60 60
61 #endif // UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_ 61 #endif // UI_OZONE_COMMON_NATIVE_DISPLAY_DELEGATE_OZONE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698