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

Side by Side Diff: chrome/browser/chromeos/login/login_web_dialog.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 #include "chrome/browser/chromeos/login/login_web_dialog.h" 5 #include "chrome/browser/chromeos/login/login_web_dialog.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/chromeos/login/helper.h" 8 #include "chrome/browser/chromeos/login/helper.h"
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" 9 #include "chrome/browser/chromeos/profiles/profile_helper.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 23 matching lines...) Expand all
34 } // namespace 34 } // namespace
35 35
36 /////////////////////////////////////////////////////////////////////////////// 36 ///////////////////////////////////////////////////////////////////////////////
37 // LoginWebDialog, public: 37 // LoginWebDialog, public:
38 38
39 void LoginWebDialog::Delegate::OnDialogClosed() { 39 void LoginWebDialog::Delegate::OnDialogClosed() {
40 } 40 }
41 41
42 LoginWebDialog::LoginWebDialog(Delegate* delegate, 42 LoginWebDialog::LoginWebDialog(Delegate* delegate,
43 gfx::NativeWindow parent_window, 43 gfx::NativeWindow parent_window,
44 const string16& title, 44 const base::string16& title,
45 const GURL& url, 45 const GURL& url,
46 Style style) 46 Style style)
47 : delegate_(delegate), 47 : delegate_(delegate),
48 parent_window_(parent_window), 48 parent_window_(parent_window),
49 title_(title), 49 title_(title),
50 url_(url), 50 url_(url),
51 style_(style), 51 style_(style),
52 is_open_(false) { 52 is_open_(false) {
53 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); 53 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
54 width_ = static_cast<int>(kDefaultWidthRatio * screen_bounds.width()); 54 width_ = static_cast<int>(kDefaultWidthRatio * screen_bounds.width());
(...skipping 10 matching lines...) Expand all
65 this); 65 this);
66 is_open_ = true; 66 is_open_ = true;
67 } 67 }
68 68
69 void LoginWebDialog::SetDialogSize(int width, int height) { 69 void LoginWebDialog::SetDialogSize(int width, int height) {
70 DCHECK(width >= 0 && height >= 0); 70 DCHECK(width >= 0 && height >= 0);
71 width_ = width; 71 width_ = width;
72 height_ = height; 72 height_ = height;
73 } 73 }
74 74
75 void LoginWebDialog::SetDialogTitle(const string16& title) { 75 void LoginWebDialog::SetDialogTitle(const base::string16& title) {
76 title_ = title; 76 title_ = title;
77 } 77 }
78 78
79 /////////////////////////////////////////////////////////////////////////////// 79 ///////////////////////////////////////////////////////////////////////////////
80 // LoginWebDialog, protected: 80 // LoginWebDialog, protected:
81 81
82 ui::ModalType LoginWebDialog::GetDialogModalType() const { 82 ui::ModalType LoginWebDialog::GetDialogModalType() const {
83 return ui::MODAL_TYPE_SYSTEM; 83 return ui::MODAL_TYPE_SYSTEM;
84 } 84 }
85 85
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 void LoginWebDialog::Observe(int type, 136 void LoginWebDialog::Observe(int type,
137 const content::NotificationSource& source, 137 const content::NotificationSource& source,
138 const content::NotificationDetails& details) { 138 const content::NotificationDetails& details) {
139 DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME); 139 DCHECK(type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME);
140 // TODO(saintlou): Do we need a throbber for Aura? 140 // TODO(saintlou): Do we need a throbber for Aura?
141 NOTIMPLEMENTED(); 141 NOTIMPLEMENTED();
142 } 142 }
143 143
144 } // namespace chromeos 144 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698