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

Side by Side Diff: chrome/browser/ui/views/html_dialog_view.h

Issue 7461136: Convert HtmlDialogUIDelegate::GetDialogTitle() to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 9 years, 4 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 | « chrome/browser/ui/login/login_prompt_ui.cc ('k') | chrome/browser/ui/views/html_dialog_view.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 CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 virtual std::wstring GetWindowTitle() const OVERRIDE; 58 virtual std::wstring GetWindowTitle() const OVERRIDE;
59 virtual void WindowClosing() OVERRIDE; 59 virtual void WindowClosing() OVERRIDE;
60 virtual views::View* GetContentsView() OVERRIDE; 60 virtual views::View* GetContentsView() OVERRIDE;
61 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 61 virtual views::View* GetInitiallyFocusedView() OVERRIDE;
62 virtual bool ShouldShowWindowTitle() const OVERRIDE; 62 virtual bool ShouldShowWindowTitle() const OVERRIDE;
63 virtual views::Widget* GetWidget() OVERRIDE; 63 virtual views::Widget* GetWidget() OVERRIDE;
64 virtual const views::Widget* GetWidget() const OVERRIDE; 64 virtual const views::Widget* GetWidget() const OVERRIDE;
65 65
66 // Overridden from HtmlDialogUIDelegate: 66 // Overridden from HtmlDialogUIDelegate:
67 virtual bool IsDialogModal() const OVERRIDE; 67 virtual bool IsDialogModal() const OVERRIDE;
68 virtual std::wstring GetDialogTitle() const OVERRIDE; 68 virtual string16 GetDialogTitle() const OVERRIDE;
69 virtual GURL GetDialogContentURL() const OVERRIDE; 69 virtual GURL GetDialogContentURL() const OVERRIDE;
70 virtual void GetWebUIMessageHandlers( 70 virtual void GetWebUIMessageHandlers(
71 std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; 71 std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE;
72 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; 72 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
73 virtual std::string GetDialogArgs() const OVERRIDE; 73 virtual std::string GetDialogArgs() const OVERRIDE;
74 virtual void OnWindowClosed() OVERRIDE; 74 virtual void OnWindowClosed() OVERRIDE;
75 virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; 75 virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
76 virtual void OnCloseContents(TabContents* source, bool* out_close_dialog) 76 virtual void OnCloseContents(TabContents* source, bool* out_close_dialog)
77 OVERRIDE; 77 OVERRIDE;
78 virtual bool ShouldShowDialogTitle() const OVERRIDE; 78 virtual bool ShouldShowDialogTitle() const OVERRIDE;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // closing) we delegate to the creator of this view, which we keep track of 114 // closing) we delegate to the creator of this view, which we keep track of
115 // using this variable. 115 // using this variable.
116 HtmlDialogUIDelegate* delegate_; 116 HtmlDialogUIDelegate* delegate_;
117 117
118 NotificationRegistrar notification_registrar_; 118 NotificationRegistrar notification_registrar_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(HtmlDialogView); 120 DISALLOW_COPY_AND_ASSIGN(HtmlDialogView);
121 }; 121 };
122 122
123 #endif // CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_ 123 #endif // CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/login/login_prompt_ui.cc ('k') | chrome/browser/ui/views/html_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698