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

Side by Side Diff: ui/aura/window.h

Issue 8428010: Cleanup: Remove ViewProp from aura build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comments Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | ui/aura/window.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_AURA_WINDOW_H_ 5 #ifndef UI_AURA_WINDOW_H_
6 #define UI_AURA_WINDOW_H_ 6 #define UI_AURA_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 13 matching lines...) Expand all
24 #include "ui/gfx/rect.h" 24 #include "ui/gfx/rect.h"
25 25
26 class SkCanvas; 26 class SkCanvas;
27 27
28 namespace ui { 28 namespace ui {
29 class Animation; 29 class Animation;
30 class Compositor; 30 class Compositor;
31 class Layer; 31 class Layer;
32 class LayerAnimationSequence; 32 class LayerAnimationSequence;
33 class Transform; 33 class Transform;
34 class ViewProp;
35 } 34 }
36 35
37 namespace aura { 36 namespace aura {
38 37
39 class Desktop; 38 class Desktop;
40 class EventFilter; 39 class EventFilter;
41 class KeyEvent; 40 class KeyEvent;
42 class LayoutManager; 41 class LayoutManager;
43 class MouseEvent; 42 class MouseEvent;
44 class ToplevelWindowContainer; 43 class ToplevelWindowContainer;
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 // provided this window has children. See set_stops_event_propagation(). 352 // provided this window has children. See set_stops_event_propagation().
354 bool stops_event_propagation_; 353 bool stops_event_propagation_;
355 354
356 ObserverList<WindowObserver> observers_; 355 ObserverList<WindowObserver> observers_;
357 356
358 // We're using ViewProp to store the property (for now) instead of 357 // We're using ViewProp to store the property (for now) instead of
359 // just using std::map because chrome is still using |ViewProp| class 358 // just using std::map because chrome is still using |ViewProp| class
360 // to create and access property. 359 // to create and access property.
361 // TODO(oshima): Consolidcate ViewProp and aura::window property 360 // TODO(oshima): Consolidcate ViewProp and aura::window property
362 // implementation. 361 // implementation.
363 std::map<const char*, ui::ViewProp*> prop_map_; 362 std::map<const char*, void*> prop_map_;
364 363
365 DISALLOW_COPY_AND_ASSIGN(Window); 364 DISALLOW_COPY_AND_ASSIGN(Window);
366 }; 365 };
367 366
368 } // namespace aura 367 } // namespace aura
369 368
370 #endif // UI_AURA_WINDOW_H_ 369 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698