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

Side by Side Diff: services/view_manager/server_view.h

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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 | « services/view_manager/animation_runner.h ('k') | services/view_manager/server_view.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 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 SERVICES_VIEW_MANAGER_SERVER_VIEW_H_ 5 #ifndef SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
6 #define SERVICES_VIEW_MANAGER_SERVER_VIEW_H_ 6 #define SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ServerView* parent_; 103 ServerView* parent_;
104 Views children_; 104 Views children_;
105 bool visible_; 105 bool visible_;
106 gfx::Rect bounds_; 106 gfx::Rect bounds_;
107 cc::SurfaceId surface_id_; 107 cc::SurfaceId surface_id_;
108 float opacity_; 108 float opacity_;
109 gfx::Transform transform_; 109 gfx::Transform transform_;
110 110
111 std::map<std::string, std::vector<uint8_t>> properties_; 111 std::map<std::string, std::vector<uint8_t>> properties_;
112 112
113 ObserverList<ServerViewObserver> observers_; 113 base::ObserverList<ServerViewObserver> observers_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(ServerView); 115 DISALLOW_COPY_AND_ASSIGN(ServerView);
116 }; 116 };
117 117
118 } // namespace view_manager 118 } // namespace view_manager
119 119
120 #endif // SERVICES_VIEW_MANAGER_SERVER_VIEW_H_ 120 #endif // SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
OLDNEW
« no previous file with comments | « services/view_manager/animation_runner.h ('k') | services/view_manager/server_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698