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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.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
« no previous file with comments | « chrome/browser/chromeos/login/eula_view.cc ('k') | chrome/browser/chromeos/login/helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/existing_user_controller.h" 5 #include "chrome/browser/chromeos/login/existing_user_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <map> 9 #include <map>
10 10
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "app/resource_bundle.h"
13 #include "base/command_line.h" 12 #include "base/command_line.h"
14 #include "base/message_loop.h" 13 #include "base/message_loop.h"
15 #include "base/stl_util-inl.h" 14 #include "base/stl_util-inl.h"
16 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
17 #include "base/values.h" 16 #include "base/values.h"
18 #include "chrome/browser/chromeos/boot_times_loader.h" 17 #include "chrome/browser/chromeos/boot_times_loader.h"
19 #include "chrome/browser/chromeos/cros/cros_library.h" 18 #include "chrome/browser/chromeos/cros/cros_library.h"
20 #include "chrome/browser/chromeos/cros/cryptohome_library.h" 19 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
21 #include "chrome/browser/chromeos/cros/login_library.h" 20 #include "chrome/browser/chromeos/cros/login_library.h"
22 #include "chrome/browser/chromeos/cros/network_library.h" 21 #include "chrome/browser/chromeos/cros/network_library.h"
23 #include "chrome/browser/chromeos/login/background_view.h" 22 #include "chrome/browser/chromeos/login/background_view.h"
24 #include "chrome/browser/chromeos/login/help_app_launcher.h" 23 #include "chrome/browser/chromeos/login/help_app_launcher.h"
25 #include "chrome/browser/chromeos/login/helper.h" 24 #include "chrome/browser/chromeos/login/helper.h"
26 #include "chrome/browser/chromeos/login/login_utils.h" 25 #include "chrome/browser/chromeos/login/login_utils.h"
27 #include "chrome/browser/chromeos/login/message_bubble.h" 26 #include "chrome/browser/chromeos/login/message_bubble.h"
28 #include "chrome/browser/chromeos/login/wizard_controller.h" 27 #include "chrome/browser/chromeos/login/wizard_controller.h"
29 #include "chrome/browser/chromeos/status/status_area_view.h" 28 #include "chrome/browser/chromeos/status/status_area_view.h"
30 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 29 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
31 #include "chrome/browser/chromeos/view_ids.h" 30 #include "chrome/browser/chromeos/view_ids.h"
32 #include "chrome/browser/chromeos/wm_ipc.h" 31 #include "chrome/browser/chromeos/wm_ipc.h"
33 #include "chrome/browser/profiles/profile_manager.h" 32 #include "chrome/browser/profiles/profile_manager.h"
34 #include "chrome/browser/ui/views/window.h" 33 #include "chrome/browser/ui/views/window.h"
35 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/net/gaia/google_service_auth_error.h" 35 #include "chrome/common/net/gaia/google_service_auth_error.h"
37 #include "gfx/native_widget_types.h" 36 #include "gfx/native_widget_types.h"
38 #include "grit/chromium_strings.h" 37 #include "grit/chromium_strings.h"
39 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
40 #include "grit/theme_resources.h" 39 #include "grit/theme_resources.h"
40 #include "ui/base/resource/resource_bundle.h"
41 #include "views/screen.h" 41 #include "views/screen.h"
42 #include "views/widget/widget_gtk.h" 42 #include "views/widget/widget_gtk.h"
43 #include "views/window/window.h" 43 #include "views/window/window.h"
44 44
45 namespace chromeos { 45 namespace chromeos {
46 46
47 namespace { 47 namespace {
48 48
49 // Max number of users we'll show. The true max is the min of this and the 49 // Max number of users we'll show. The true max is the min of this and the
50 // number of windows that fit on the screen. 50 // number of windows that fit on the screen.
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 login_performer_->RecoverEncryptedData(old_password); 652 login_performer_->RecoverEncryptedData(old_password);
653 } 653 }
654 654
655 void ExistingUserController::ResyncEncryptedData() { 655 void ExistingUserController::ResyncEncryptedData() {
656 // LoginPerformer instance has state of the user so it should exist. 656 // LoginPerformer instance has state of the user so it should exist.
657 if (login_performer_.get()) 657 if (login_performer_.get())
658 login_performer_->ResyncEncryptedData(); 658 login_performer_->ResyncEncryptedData();
659 } 659 }
660 660
661 } // namespace chromeos 661 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/eula_view.cc ('k') | chrome/browser/chromeos/login/helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698