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

Side by Side Diff: chrome/browser/chromeos/login/network_screen.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_screen.h" 5 #include "chrome/browser/chromeos/login/network_screen.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h"
9 #include "base/logging.h" 8 #include "base/logging.h"
10 #include "base/string16.h" 9 #include "base/string16.h"
11 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/chromeos/cros/cros_library.h" 11 #include "chrome/browser/chromeos/cros/cros_library.h"
13 #include "chrome/browser/chromeos/login/help_app_launcher.h" 12 #include "chrome/browser/chromeos/login/help_app_launcher.h"
14 #include "chrome/browser/chromeos/login/network_selection_view.h" 13 #include "chrome/browser/chromeos/login/network_selection_view.h"
15 #include "chrome/browser/chromeos/login/screen_observer.h" 14 #include "chrome/browser/chromeos/login/screen_observer.h"
16 #include "grit/chromium_strings.h" 15 #include "grit/chromium_strings.h"
17 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
18 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 #include "ui/base/resource/resource_bundle.h"
19 #include "views/controls/menu/menu_2.h" 19 #include "views/controls/menu/menu_2.h"
20 #include "views/widget/widget.h" 20 #include "views/widget/widget.h"
21 #include "views/window/window.h" 21 #include "views/window/window.h"
22 22
23 23
24 namespace { 24 namespace {
25 25
26 // Time in seconds for connection timeout. 26 // Time in seconds for connection timeout.
27 const int kConnectionTimeoutSec = 15; 27 const int kConnectionTimeoutSec = 15;
28 28
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 &NetworkScreen::OnConnectionTimeout); 217 &NetworkScreen::OnConnectionTimeout);
218 } 218 }
219 219
220 network_id_ = network_id; 220 network_id_ = network_id;
221 view()->ShowConnectingStatus(continue_pressed_, network_id_); 221 view()->ShowConnectingStatus(continue_pressed_, network_id_);
222 222
223 view()->EnableContinue(false); 223 view()->EnableContinue(false);
224 } 224 }
225 225
226 } // namespace chromeos 226 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/message_bubble.cc ('k') | chrome/browser/chromeos/login/network_selection_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698