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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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) 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/network_selection_view.h" 5 #include "chrome/browser/chromeos/login/network_selection_view.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 #include <string> 9 #include <string>
10 10
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/keyboard_switch_menu.h" 13 #include "chrome/browser/chromeos/login/keyboard_switch_menu.h"
14 #include "chrome/browser/chromeos/login/language_switch_menu.h" 14 #include "chrome/browser/chromeos/login/language_switch_menu.h"
15 #include "chrome/browser/chromeos/login/network_screen_delegate.h" 15 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
16 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" 16 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
17 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" 17 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
18 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" 18 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
19 #include "chrome/browser/chromeos/status/network_dropdown_button.h" 19 #include "chrome/browser/chromeos/status/network_dropdown_button.h"
20 #include "gfx/size.h"
21 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
22 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
23 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
24 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
25 #include "ui/gfx/size.h"
26 #include "views/controls/label.h" 26 #include "views/controls/label.h"
27 #include "views/controls/throbber.h" 27 #include "views/controls/throbber.h"
28 #include "views/layout/fill_layout.h" 28 #include "views/layout/fill_layout.h"
29 #include "views/layout/grid_layout.h" 29 #include "views/layout/grid_layout.h"
30 #include "views/layout/layout_constants.h" 30 #include "views/layout/layout_constants.h"
31 #include "views/widget/widget.h" 31 #include "views/widget/widget.h"
32 #include "views/widget/widget_gtk.h" 32 #include "views/widget/widget_gtk.h"
33 #include "views/window/non_client_view.h" 33 #include "views/window/non_client_view.h"
34 #include "views/window/window.h" 34 #include "views/window/window.h"
35 #include "views/window/window_gtk.h" 35 #include "views/window/window_gtk.h"
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON))); 456 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)));
457 continue_button_->SetEnabled(is_continue_enabled); 457 continue_button_->SetEnabled(is_continue_enabled);
458 } 458 }
459 459
460 void NetworkSelectionView::UpdateConnectingNetworkLabel() { 460 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
461 connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16( 461 connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
462 IDS_NETWORK_SELECTION_CONNECTING, network_id_))); 462 IDS_NETWORK_SELECTION_CONNECTING, network_id_)));
463 } 463 }
464 464
465 } // namespace chromeos 465 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_html_dialog.cc ('k') | chrome/browser/chromeos/login/new_user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698