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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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/wizard_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 24 matching lines...) Expand all
35 #include "base/strings/stringprintf.h" 35 #include "base/strings/stringprintf.h"
36 #include "base/strings/utf_string_conversions.h" 36 #include "base/strings/utf_string_conversions.h"
37 #include "base/threading/sequenced_worker_pool.h" 37 #include "base/threading/sequenced_worker_pool.h"
38 #include "base/values.h" 38 #include "base/values.h"
39 #include "chrome/browser/browser_process.h" 39 #include "chrome/browser/browser_process.h"
40 #include "chrome/browser/chrome_notification_types.h" 40 #include "chrome/browser/chrome_notification_types.h"
41 #include "chrome/browser/chromeos/extensions/device_local_account_external_polic y_loader.h" 41 #include "chrome/browser/chromeos/extensions/device_local_account_external_polic y_loader.h"
42 #include "chrome/browser/chromeos/extensions/external_cache.h" 42 #include "chrome/browser/chromeos/extensions/external_cache.h"
43 #include "chrome/browser/chromeos/input_method/input_method_util.h" 43 #include "chrome/browser/chromeos/input_method/input_method_util.h"
44 #include "chrome/browser/chromeos/login/existing_user_controller.h" 44 #include "chrome/browser/chromeos/login/existing_user_controller.h"
45 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" 45 #include "chrome/browser/chromeos/login/screens/base_screen.h"
46 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 46 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
47 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 47 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
48 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 48 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
49 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 49 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
50 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" 50 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
51 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h" 51 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h"
52 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" 52 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
53 #include "chrome/browser/chromeos/login/wizard_controller.h" 53 #include "chrome/browser/chromeos/login/wizard_controller.h"
54 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 54 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
55 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h" 55 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h"
(...skipping 2009 matching lines...) Expand 10 before | Expand all | Expand 10 after
2065 ASSERT_TRUE(content::ExecuteScript(contents_, 2065 ASSERT_TRUE(content::ExecuteScript(contents_,
2066 "$('tos-accept-button').click();")); 2066 "$('tos-accept-button').click();"));
2067 2067
2068 WaitForSessionStart(); 2068 WaitForSessionStart();
2069 } 2069 }
2070 2070
2071 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2071 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2072 TermsOfServiceDownloadTest, testing::Bool()); 2072 TermsOfServiceDownloadTest, testing::Bool());
2073 2073
2074 } // namespace policy 2074 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698