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

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

Issue 132013004: Moves transient window observer methods out of WindowObserver (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments and update gyp Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 23 matching lines...) Expand all
34 class Transform; 34 class Transform;
35 class Vector2d; 35 class Vector2d;
36 } 36 }
37 37
38 namespace ui { 38 namespace ui {
39 class EventHandler; 39 class EventHandler;
40 class Layer; 40 class Layer;
41 class Texture; 41 class Texture;
42 } 42 }
43 43
44 // TODO(sky): nuke. Temporary while moving transients out of Window.
45 namespace views {
46 namespace corewm {
47 class TransientWindowManager;
48 }
49 }
50 namespace aura { 44 namespace aura {
51 45
52 class LayoutManager; 46 class LayoutManager;
53 class RootWindow; 47 class RootWindow;
54 class WindowDelegate; 48 class WindowDelegate;
55 class WindowObserver; 49 class WindowObserver;
56 50
57 // TODO(beng): remove once RootWindow is renamed. 51 // TODO(beng): remove once RootWindow is renamed.
58 typedef RootWindow WindowEventDispatcher; 52 typedef RootWindow WindowEventDispatcher;
59 53
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 void PrintWindowHierarchy(int depth) const; 356 void PrintWindowHierarchy(int depth) const;
363 #endif 357 #endif
364 358
365 protected: 359 protected:
366 // Deletes (or removes if not owned by parent) all child windows. Intended for 360 // Deletes (or removes if not owned by parent) all child windows. Intended for
367 // use from the destructor. 361 // use from the destructor.
368 void RemoveOrDestroyChildren(); 362 void RemoveOrDestroyChildren();
369 363
370 private: 364 private:
371 friend class test::WindowTestApi; 365 friend class test::WindowTestApi;
372 // TODO(sky): temporary until TransientWindowManager gets its own observer.
373 friend class views::corewm::TransientWindowManager;
374 friend class LayoutManager; 366 friend class LayoutManager;
375 friend class RootWindow; 367 friend class RootWindow;
376 friend class WindowTargeter; 368 friend class WindowTargeter;
377 369
378 // Called by the public {Set,Get,Clear}Property functions. 370 // Called by the public {Set,Get,Clear}Property functions.
379 int64 SetPropertyInternal(const void* key, 371 int64 SetPropertyInternal(const void* key,
380 const char* name, 372 const char* name,
381 PropertyDeallocator deallocator, 373 PropertyDeallocator deallocator,
382 int64 value, 374 int64 value,
383 int64 default_value); 375 int64 default_value);
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 }; 567 };
576 568
577 std::map<const void*, Value> prop_map_; 569 std::map<const void*, Value> prop_map_;
578 570
579 DISALLOW_COPY_AND_ASSIGN(Window); 571 DISALLOW_COPY_AND_ASSIGN(Window);
580 }; 572 };
581 573
582 } // namespace aura 574 } // namespace aura
583 575
584 #endif // UI_AURA_WINDOW_H_ 576 #endif // UI_AURA_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698