OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/web_page_view.h" | 5 #include "chrome/browser/chromeos/login/web_page_view.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/time.h" | 12 #include "base/time.h" |
| 13 #include "base/utf_string_conversions.h" |
13 #include "chrome/browser/child_process_security_policy.h" | 14 #include "chrome/browser/child_process_security_policy.h" |
14 #include "chrome/browser/chromeos/login/helper.h" | 15 #include "chrome/browser/chromeos/login/helper.h" |
15 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" | 16 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" |
16 #include "chrome/browser/dom_ui/dom_ui.h" | 17 #include "chrome/browser/dom_ui/dom_ui.h" |
17 #include "chrome/browser/tab_contents/tab_contents.h" | 18 #include "chrome/browser/tab_contents/tab_contents.h" |
18 #include "chrome/common/bindings_policy.h" | 19 #include "chrome/common/bindings_policy.h" |
19 #include "gfx/canvas.h" | 20 #include "gfx/canvas.h" |
20 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
21 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
22 #include "ipc/ipc_message.h" | 23 #include "ipc/ipc_message.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 set_background( | 110 set_background( |
110 views::Background::CreateBackgroundPainter(true, painter)); | 111 views::Background::CreateBackgroundPainter(true, painter)); |
111 set_border(CreateWizardBorder(&BorderDefinition::kScreenBorder)); | 112 set_border(CreateWizardBorder(&BorderDefinition::kScreenBorder)); |
112 dom_view()->SetVisible(false); | 113 dom_view()->SetVisible(false); |
113 AddChildView(dom_view()); | 114 AddChildView(dom_view()); |
114 | 115 |
115 throbber_ = CreateDefaultThrobber(); | 116 throbber_ = CreateDefaultThrobber(); |
116 AddChildView(throbber_); | 117 AddChildView(throbber_); |
117 | 118 |
118 connecting_label_ = new views::Label(); | 119 connecting_label_ = new views::Label(); |
119 connecting_label_->SetText(l10n_util::GetString(IDS_LOAD_STATE_CONNECTING)); | 120 connecting_label_->SetText( |
| 121 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING))); |
120 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 122 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
121 connecting_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont)); | 123 connecting_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont)); |
122 connecting_label_->SetVisible(false); | 124 connecting_label_->SetVisible(false); |
123 AddChildView(connecting_label_ ); | 125 AddChildView(connecting_label_ ); |
124 | 126 |
125 start_timer_.Start(TimeDelta::FromMilliseconds(kStartDelayMs), | 127 start_timer_.Start(TimeDelta::FromMilliseconds(kStartDelayMs), |
126 this, | 128 this, |
127 &WebPageView::ShowWaitingControls); | 129 &WebPageView::ShowWaitingControls); |
128 } | 130 } |
129 | 131 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 throbber_->GetPreferredSize().width(), | 183 throbber_->GetPreferredSize().width(), |
182 throbber_->GetPreferredSize().height()); | 184 throbber_->GetPreferredSize().height()); |
183 connecting_label_->SetBounds( | 185 connecting_label_->SetBounds( |
184 width() / 2 - connecting_label_->GetPreferredSize().width() / 2, | 186 width() / 2 - connecting_label_->GetPreferredSize().width() / 2, |
185 y + throbber_->GetPreferredSize().height() + kSpacing, | 187 y + throbber_->GetPreferredSize().height() + kSpacing, |
186 connecting_label_->GetPreferredSize().width(), | 188 connecting_label_->GetPreferredSize().width(), |
187 connecting_label_->GetPreferredSize().height()); | 189 connecting_label_->GetPreferredSize().height()); |
188 } | 190 } |
189 | 191 |
190 } // namespace chromeos | 192 } // namespace chromeos |
OLD | NEW |