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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
OLDNEW
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"
9 #include "base/callback.h" 8 #include "base/callback.h"
10 #include "base/logging.h" 9 #include "base/logging.h"
11 #include "base/string_util.h" 10 #include "base/string_util.h"
12 #include "base/time.h" 11 #include "base/time.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/child_process_security_policy.h" 13 #include "chrome/browser/child_process_security_policy.h"
15 #include "chrome/browser/chromeos/login/helper.h" 14 #include "chrome/browser/chromeos/login/helper.h"
16 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" 15 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
17 #include "chrome/browser/dom_ui/dom_ui.h" 16 #include "chrome/browser/dom_ui/dom_ui.h"
18 #include "chrome/browser/tab_contents/tab_contents.h" 17 #include "chrome/browser/tab_contents/tab_contents.h"
19 #include "chrome/common/bindings_policy.h" 18 #include "chrome/common/bindings_policy.h"
20 #include "gfx/canvas.h" 19 #include "gfx/canvas.h"
21 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
22 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
23 #include "ipc/ipc_message.h" 22 #include "ipc/ipc_message.h"
24 #include "third_party/skia/include/core/SkColor.h" 23 #include "third_party/skia/include/core/SkColor.h"
24 #include "ui/base/resource/resource_bundle.h"
25 #include "views/background.h" 25 #include "views/background.h"
26 #include "views/border.h" 26 #include "views/border.h"
27 #include "views/controls/label.h" 27 #include "views/controls/label.h"
28 #include "views/controls/throbber.h" 28 #include "views/controls/throbber.h"
29 29
30 using base::TimeDelta; 30 using base::TimeDelta;
31 using views::Label; 31 using views::Label;
32 using views::View; 32 using views::View;
33 using webkit_glue::FormData; 33 using webkit_glue::FormData;
34 34
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 throbber_->GetPreferredSize().width(), 183 throbber_->GetPreferredSize().width(),
184 throbber_->GetPreferredSize().height()); 184 throbber_->GetPreferredSize().height());
185 connecting_label_->SetBounds( 185 connecting_label_->SetBounds(
186 width() / 2 - connecting_label_->GetPreferredSize().width() / 2, 186 width() / 2 - connecting_label_->GetPreferredSize().width() / 2,
187 y + throbber_->GetPreferredSize().height() + kSpacing, 187 y + throbber_->GetPreferredSize().height() + kSpacing,
188 connecting_label_->GetPreferredSize().width(), 188 connecting_label_->GetPreferredSize().width(),
189 connecting_label_->GetPreferredSize().height()); 189 connecting_label_->GetPreferredSize().height());
190 } 190 }
191 191
192 } // namespace chromeos 192 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_view.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698