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

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

Issue 15759009: ui/aura: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/aura/remote_root_window_host_win.cc ('k') | no next file » | 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) 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // shell -- Aura itself shouldn't contain type-specific logic. 86 // shell -- Aura itself shouldn't contain type-specific logic.
87 client::WindowType type() const { return type_; } 87 client::WindowType type() const { return type_; }
88 void SetType(client::WindowType type); 88 void SetType(client::WindowType type);
89 89
90 int id() const { return id_; } 90 int id() const { return id_; }
91 void set_id(int id) { id_ = id; } 91 void set_id(int id) { id_ = id; }
92 92
93 const std::string& name() const { return name_; } 93 const std::string& name() const { return name_; }
94 void SetName(const std::string& name); 94 void SetName(const std::string& name);
95 95
96 const string16 title() const { return title_; } 96 const base::string16 title() const { return title_; }
97 void set_title(const string16& title) { title_ = title; } 97 void set_title(const base::string16& title) { title_ = title; }
98 98
99 bool transparent() const { return transparent_; } 99 bool transparent() const { return transparent_; }
100 void SetTransparent(bool transparent); 100 void SetTransparent(bool transparent);
101 101
102 WindowDelegate* delegate() { return delegate_; } 102 WindowDelegate* delegate() { return delegate_; }
103 103
104 const gfx::Rect& bounds() const; 104 const gfx::Rect& bounds() const;
105 105
106 Window* parent() { return parent_; } 106 Window* parent() { return parent_; }
107 const Window* parent() const { return parent_; } 107 const Window* parent() const { return parent_; }
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 Window* transient_parent_; 479 Window* transient_parent_;
480 480
481 // The visibility state of the window as set by Show()/Hide(). This may differ 481 // The visibility state of the window as set by Show()/Hide(). This may differ
482 // from the visibility of the underlying layer, which may remain visible after 482 // from the visibility of the underlying layer, which may remain visible after
483 // the window is hidden (e.g. to animate its disappearance). 483 // the window is hidden (e.g. to animate its disappearance).
484 bool visible_; 484 bool visible_;
485 485
486 int id_; 486 int id_;
487 std::string name_; 487 std::string name_;
488 488
489 string16 title_; 489 base::string16 title_;
490 490
491 // Whether layer is initialized as non-opaque. 491 // Whether layer is initialized as non-opaque.
492 bool transparent_; 492 bool transparent_;
493 493
494 scoped_ptr<ui::EventHandler> event_filter_; 494 scoped_ptr<ui::EventHandler> event_filter_;
495 scoped_ptr<LayoutManager> layout_manager_; 495 scoped_ptr<LayoutManager> layout_manager_;
496 496
497 void* user_data_; 497 void* user_data_;
498 498
499 // Makes the window pass all events through to any windows behind it. 499 // Makes the window pass all events through to any windows behind it.
(...skipping 16 matching lines...) Expand all
516 }; 516 };
517 517
518 std::map<const void*, Value> prop_map_; 518 std::map<const void*, Value> prop_map_;
519 519
520 DISALLOW_COPY_AND_ASSIGN(Window); 520 DISALLOW_COPY_AND_ASSIGN(Window);
521 }; 521 };
522 522
523 } // namespace aura 523 } // namespace aura
524 524
525 #endif // UI_AURA_WINDOW_H_ 525 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/remote_root_window_host_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698