OLD | NEW |
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/chromeos/login/web_page_view.h" | 5 #include "chrome/browser/chromeos/login/web_page_view.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/chromeos/login/helper.h" | 12 #include "chrome/browser/chromeos/login/helper.h" |
13 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" | 13 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "content/browser/child_process_security_policy.h" | 15 #include "content/browser/child_process_security_policy.h" |
| 16 #include "content/public/browser/site_instance.h" |
16 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
17 #include "content/public/browser/web_ui.h" | 18 #include "content/public/browser/web_ui.h" |
18 #include "content/public/common/bindings_policy.h" | 19 #include "content/public/common/bindings_policy.h" |
19 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
20 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
21 #include "ipc/ipc_message.h" | 22 #include "ipc/ipc_message.h" |
22 #include "third_party/skia/include/core/SkColor.h" | 23 #include "third_party/skia/include/core/SkColor.h" |
23 #include "ui/base/l10n/l10n_util.h" | 24 #include "ui/base/l10n/l10n_util.h" |
24 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
25 #include "ui/gfx/canvas.h" | 26 #include "ui/gfx/canvas.h" |
26 #include "ui/views/background.h" | 27 #include "ui/views/background.h" |
27 #include "ui/views/border.h" | 28 #include "ui/views/border.h" |
28 #include "ui/views/controls/label.h" | 29 #include "ui/views/controls/label.h" |
29 #include "ui/views/controls/throbber.h" | 30 #include "ui/views/controls/throbber.h" |
30 | 31 |
31 using base::TimeDelta; | 32 using base::TimeDelta; |
| 33 using content::SiteInstance; |
32 using views::Label; | 34 using views::Label; |
33 using views::View; | 35 using views::View; |
34 | 36 |
35 namespace chromeos { | 37 namespace chromeos { |
36 | 38 |
37 namespace { | 39 namespace { |
38 | 40 |
39 // Spacing (vertical/horizontal) between controls. | 41 // Spacing (vertical/horizontal) between controls. |
40 const int kSpacing = 10; | 42 const int kSpacing = 10; |
41 | 43 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 throbber_->GetPreferredSize().width(), | 141 throbber_->GetPreferredSize().width(), |
140 throbber_->GetPreferredSize().height()); | 142 throbber_->GetPreferredSize().height()); |
141 connecting_label_->SetBounds( | 143 connecting_label_->SetBounds( |
142 width() / 2 - connecting_label_->GetPreferredSize().width() / 2, | 144 width() / 2 - connecting_label_->GetPreferredSize().width() / 2, |
143 y + throbber_->GetPreferredSize().height() + kSpacing, | 145 y + throbber_->GetPreferredSize().height() + kSpacing, |
144 connecting_label_->GetPreferredSize().width(), | 146 connecting_label_->GetPreferredSize().width(), |
145 connecting_label_->GetPreferredSize().height()); | 147 connecting_label_->GetPreferredSize().height()); |
146 } | 148 } |
147 | 149 |
148 } // namespace chromeos | 150 } // namespace chromeos |
OLD | NEW |