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

Side by Side Diff: ui/views/controls/webview/web_dialog_view.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
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_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 virtual gfx::Size GetMinimumSize() OVERRIDE; 56 virtual gfx::Size GetMinimumSize() OVERRIDE;
57 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) 57 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
58 OVERRIDE; 58 OVERRIDE;
59 virtual void ViewHierarchyChanged( 59 virtual void ViewHierarchyChanged(
60 const ViewHierarchyChangedDetails& details) OVERRIDE; 60 const ViewHierarchyChangedDetails& details) OVERRIDE;
61 virtual bool CanClose() OVERRIDE; 61 virtual bool CanClose() OVERRIDE;
62 62
63 // Overridden from views::WidgetDelegate: 63 // Overridden from views::WidgetDelegate:
64 virtual bool CanResize() const OVERRIDE; 64 virtual bool CanResize() const OVERRIDE;
65 virtual ui::ModalType GetModalType() const OVERRIDE; 65 virtual ui::ModalType GetModalType() const OVERRIDE;
66 virtual string16 GetWindowTitle() const OVERRIDE; 66 virtual base::string16 GetWindowTitle() const OVERRIDE;
67 virtual std::string GetWindowName() const OVERRIDE; 67 virtual std::string GetWindowName() const OVERRIDE;
68 virtual void WindowClosing() OVERRIDE; 68 virtual void WindowClosing() OVERRIDE;
69 virtual views::View* GetContentsView() OVERRIDE; 69 virtual views::View* GetContentsView() OVERRIDE;
70 virtual ClientView* CreateClientView(views::Widget* widget) OVERRIDE; 70 virtual ClientView* CreateClientView(views::Widget* widget) OVERRIDE;
71 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 71 virtual views::View* GetInitiallyFocusedView() OVERRIDE;
72 virtual bool ShouldShowWindowTitle() const OVERRIDE; 72 virtual bool ShouldShowWindowTitle() const OVERRIDE;
73 virtual views::Widget* GetWidget() OVERRIDE; 73 virtual views::Widget* GetWidget() OVERRIDE;
74 virtual const views::Widget* GetWidget() const OVERRIDE; 74 virtual const views::Widget* GetWidget() const OVERRIDE;
75 75
76 // Overridden from ui::WebDialogDelegate: 76 // Overridden from ui::WebDialogDelegate:
77 virtual ui::ModalType GetDialogModalType() const OVERRIDE; 77 virtual ui::ModalType GetDialogModalType() const OVERRIDE;
78 virtual string16 GetDialogTitle() const OVERRIDE; 78 virtual base::string16 GetDialogTitle() const OVERRIDE;
79 virtual GURL GetDialogContentURL() const OVERRIDE; 79 virtual GURL GetDialogContentURL() const OVERRIDE;
80 virtual void GetWebUIMessageHandlers( 80 virtual void GetWebUIMessageHandlers(
81 std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; 81 std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
82 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; 82 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
83 virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE; 83 virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE;
84 virtual std::string GetDialogArgs() const OVERRIDE; 84 virtual std::string GetDialogArgs() const OVERRIDE;
85 virtual void OnDialogShown( 85 virtual void OnDialogShown(
86 content::WebUI* webui, 86 content::WebUI* webui,
87 content::RenderViewHost* render_view_host) OVERRIDE; 87 content::RenderViewHost* render_view_host) OVERRIDE;
88 virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; 88 virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 // Whether CloseContents() has been called. 152 // Whether CloseContents() has been called.
153 bool close_contents_called_; 153 bool close_contents_called_;
154 154
155 DISALLOW_COPY_AND_ASSIGN(WebDialogView); 155 DISALLOW_COPY_AND_ASSIGN(WebDialogView);
156 }; 156 };
157 157
158 } // namespace views 158 } // namespace views
159 159
160 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 160 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/tree/tree_view_unittest.cc ('k') | ui/views/controls/webview/web_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698