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

Side by Side Diff: ui/views/test/child_modal_window.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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/views/linux_ui/status_icon_linux.h ('k') | ui/views/test/child_modal_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) 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_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_ 5 #ifndef UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_
6 #define UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_ 6 #define UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_
7 7
8 #include "ui/views/controls/button/button.h" 8 #include "ui/views/controls/button/button.h"
9 #include "ui/views/widget/widget_delegate.h" 9 #include "ui/views/widget/widget_delegate.h"
10 #include "ui/views/widget/widget_observer.h" 10 #include "ui/views/widget/widget_observer.h"
(...skipping 17 matching lines...) Expand all
28 28
29 void ShowChild(); 29 void ShowChild();
30 gfx::NativeWindow GetModalParent() const; 30 gfx::NativeWindow GetModalParent() const;
31 gfx::NativeWindow GetChild() const; 31 gfx::NativeWindow GetChild() const;
32 32
33 private: 33 private:
34 Widget* CreateChild(); 34 Widget* CreateChild();
35 35
36 // Overridden from WidgetDelegate: 36 // Overridden from WidgetDelegate:
37 virtual View* GetContentsView() OVERRIDE; 37 virtual View* GetContentsView() OVERRIDE;
38 virtual string16 GetWindowTitle() const OVERRIDE; 38 virtual base::string16 GetWindowTitle() const OVERRIDE;
39 virtual bool CanResize() const OVERRIDE; 39 virtual bool CanResize() const OVERRIDE;
40 virtual void DeleteDelegate() OVERRIDE; 40 virtual void DeleteDelegate() OVERRIDE;
41 virtual void Layout() OVERRIDE; 41 virtual void Layout() OVERRIDE;
42 virtual void ViewHierarchyChanged( 42 virtual void ViewHierarchyChanged(
43 const ViewHierarchyChangedDetails& details) OVERRIDE; 43 const ViewHierarchyChangedDetails& details) OVERRIDE;
44 44
45 // Overridden from ButtonListener: 45 // Overridden from ButtonListener:
46 virtual void ButtonPressed(Button* sender, 46 virtual void ButtonPressed(Button* sender,
47 const ui::Event& event) OVERRIDE; 47 const ui::Event& event) OVERRIDE;
48 48
(...skipping 17 matching lines...) Expand all
66 // The child window. 66 // The child window.
67 Widget* child_; 67 Widget* child_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(ChildModalParent); 69 DISALLOW_COPY_AND_ASSIGN(ChildModalParent);
70 }; 70 };
71 71
72 } // namespace test 72 } // namespace test
73 } // namespace views 73 } // namespace views
74 74
75 #endif // UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_ 75 #endif // UI_VIEWS_TEST_CHILD_WMODAL_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/views/linux_ui/status_icon_linux.h ('k') | ui/views/test/child_modal_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698