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

Side by Side Diff: chrome/browser/browser_signin.cc

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 | « no previous file | chrome/browser/chromeos/choose_mobile_network_dialog.h » ('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 #include "chrome/browser/browser_signin.h" 5 #include "chrome/browser/browser_signin.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 public: 76 public:
77 BrowserSigninHtml(BrowserSignin* signin, 77 BrowserSigninHtml(BrowserSignin* signin,
78 const string16& suggested_email, 78 const string16& suggested_email,
79 const string16& login_message); 79 const string16& login_message);
80 virtual ~BrowserSigninHtml() {} 80 virtual ~BrowserSigninHtml() {}
81 81
82 // HtmlDialogUIDelegate implementation 82 // HtmlDialogUIDelegate implementation
83 virtual bool IsDialogModal() const OVERRIDE { 83 virtual bool IsDialogModal() const OVERRIDE {
84 return false; 84 return false;
85 }; 85 };
86 virtual std::wstring GetDialogTitle() const OVERRIDE { 86 virtual string16 GetDialogTitle() const OVERRIDE {
87 return L""; 87 return string16();
88 } 88 }
89 virtual GURL GetDialogContentURL() const OVERRIDE { 89 virtual GURL GetDialogContentURL() const OVERRIDE {
90 return GURL("chrome://dialog/signin"); 90 return GURL("chrome://dialog/signin");
91 } 91 }
92 virtual void GetWebUIMessageHandlers( 92 virtual void GetWebUIMessageHandlers(
93 std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE { 93 std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE {
94 const WebUIMessageHandler* handler = this; 94 const WebUIMessageHandler* handler = this;
95 handlers->push_back(const_cast<WebUIMessageHandler*>(handler)); 95 handlers->push_back(const_cast<WebUIMessageHandler*>(handler));
96 } 96 }
97 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE { 97 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 326
327 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) { 327 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) {
328 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog. 328 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog.
329 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS) 329 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS)
330 html_dialog_ui_delegate_ = CreateHtmlDialogUI(); 330 html_dialog_ui_delegate_ = CreateHtmlDialogUI();
331 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_, 331 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_,
332 html_dialog_ui_delegate_, 332 html_dialog_ui_delegate_,
333 tab_contents); 333 tab_contents);
334 #endif 334 #endif
335 } 335 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/choose_mobile_network_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698