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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <vector> 5 #include <vector>
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/desktop_background/desktop_background_controller_observer.h" 8 #include "ash/desktop_background/desktop_background_controller_observer.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/prefs/pref_service.h"
18 #include "base/run_loop.h" 17 #include "base/run_loop.h"
19 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
21 #include "base/synchronization/lock.h" 20 #include "base/synchronization/lock.h"
22 #include "chrome/browser/chrome_notification_types.h" 21 #include "chrome/browser/chrome_notification_types.h"
23 #include "chrome/browser/chromeos/app_mode/fake_cws.h" 22 #include "chrome/browser/chromeos/app_mode/fake_cws.h"
24 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 23 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
25 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 24 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
26 #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h" 25 #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h"
27 #include "chrome/browser/chromeos/login/app_launch_controller.h" 26 #include "chrome/browser/chromeos/login/app_launch_controller.h"
(...skipping 22 matching lines...) Expand all
50 #include "chrome/browser/signin/signin_manager_factory.h" 49 #include "chrome/browser/signin/signin_manager_factory.h"
51 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" 50 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
52 #include "chrome/common/chrome_constants.h" 51 #include "chrome/common/chrome_constants.h"
53 #include "chrome/common/chrome_paths.h" 52 #include "chrome/common/chrome_paths.h"
54 #include "chrome/common/pref_names.h" 53 #include "chrome/common/pref_names.h"
55 #include "chromeos/chromeos_paths.h" 54 #include "chromeos/chromeos_paths.h"
56 #include "chromeos/chromeos_switches.h" 55 #include "chromeos/chromeos_switches.h"
57 #include "chromeos/dbus/cryptohome_client.h" 56 #include "chromeos/dbus/cryptohome_client.h"
58 #include "chromeos/disks/disk_mount_manager.h" 57 #include "chromeos/disks/disk_mount_manager.h"
59 #include "chromeos/settings/cros_settings_provider.h" 58 #include "chromeos/settings/cros_settings_provider.h"
59 #include "components/prefs/pref_service.h"
60 #include "components/signin/core/browser/signin_manager.h" 60 #include "components/signin/core/browser/signin_manager.h"
61 #include "components/signin/core/common/signin_pref_names.h" 61 #include "components/signin/core/common/signin_pref_names.h"
62 #include "content/public/browser/browser_thread.h" 62 #include "content/public/browser/browser_thread.h"
63 #include "content/public/browser/notification_observer.h" 63 #include "content/public/browser/notification_observer.h"
64 #include "content/public/browser/notification_registrar.h" 64 #include "content/public/browser/notification_registrar.h"
65 #include "content/public/browser/notification_service.h" 65 #include "content/public/browser/notification_service.h"
66 #include "content/public/browser/web_ui.h" 66 #include "content/public/browser/web_ui.h"
67 #include "content/public/test/browser_test_utils.h" 67 #include "content/public/test/browser_test_utils.h"
68 #include "extensions/browser/app_window/app_window.h" 68 #include "extensions/browser/app_window/app_window.h"
69 #include "extensions/browser/app_window/app_window_registry.h" 69 #include "extensions/browser/app_window/app_window_registry.h"
(...skipping 2241 matching lines...) Expand 10 before | Expand all | Expand 10 after
2311 content::WindowedNotificationObserver( 2311 content::WindowedNotificationObserver(
2312 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 2312 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
2313 content::NotificationService::AllSources()).Wait(); 2313 content::NotificationService::AllSources()).Wait();
2314 2314
2315 // Wait for the wallpaper to load. 2315 // Wait for the wallpaper to load.
2316 WaitForWallpaper(); 2316 WaitForWallpaper();
2317 EXPECT_TRUE(wallpaper_loaded()); 2317 EXPECT_TRUE(wallpaper_loaded());
2318 } 2318 }
2319 2319
2320 } // namespace chromeos 2320 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698