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

Side by Side Diff: components/arc/test/fake_app_instance.h

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 months 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
« no previous file with comments | « components/arc/power/arc_power_bridge.cc ('k') | components/arc/test/fake_app_instance.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_ 5 #ifndef COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_
6 #define COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_ 6 #define COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 25 matching lines...) Expand all
36 std::string activity_; 36 std::string activity_;
37 37
38 DISALLOW_COPY_AND_ASSIGN(Request); 38 DISALLOW_COPY_AND_ASSIGN(Request);
39 }; 39 };
40 40
41 class IconRequest : public Request { 41 class IconRequest : public Request {
42 public: 42 public:
43 IconRequest(const std::string& package, 43 IconRequest(const std::string& package,
44 const std::string& activity, 44 const std::string& activity,
45 ScaleFactor scale_factor) 45 ScaleFactor scale_factor)
46 : Request(package, activity), scale_factor_(scale_factor) {} 46 : Request(package, activity),
47 scale_factor_(static_cast<int>(scale_factor)) {}
47 ~IconRequest() {} 48 ~IconRequest() {}
48 49
49 int scale_factor() const { return scale_factor_; } 50 int scale_factor() const { return scale_factor_; }
50 51
51 private: 52 private:
52 int scale_factor_; 53 int scale_factor_;
53 54
54 DISALLOW_COPY_AND_ASSIGN(IconRequest); 55 DISALLOW_COPY_AND_ASSIGN(IconRequest);
55 }; 56 };
56 57
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 int refresh_app_list_count_ = 0; 106 int refresh_app_list_count_ = 0;
106 // Keeps information about launch requests. 107 // Keeps information about launch requests.
107 ScopedVector<Request> launch_requests_; 108 ScopedVector<Request> launch_requests_;
108 // Keeps information about icon load requests. 109 // Keeps information about icon load requests.
109 ScopedVector<IconRequest> icon_requests_; 110 ScopedVector<IconRequest> icon_requests_;
110 }; 111 };
111 112
112 } // namespace arc 113 } // namespace arc
113 114
114 #endif // COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_ 115 #endif // COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_
OLDNEW
« no previous file with comments | « components/arc/power/arc_power_bridge.cc ('k') | components/arc/test/fake_app_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698