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

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

Issue 2919583002: chromeos: Move InputMethodUtil into //ui/base/ime/chromeos (Closed)
Patch Set: Created 3 years, 6 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
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 "chrome/browser/chromeos/policy/device_local_account.h" 5 #include "chrome/browser/chromeos/policy/device_local_account.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 25 matching lines...) Expand all
36 #include "base/strings/string_util.h" 36 #include "base/strings/string_util.h"
37 #include "base/strings/stringprintf.h" 37 #include "base/strings/stringprintf.h"
38 #include "base/strings/utf_string_conversions.h" 38 #include "base/strings/utf_string_conversions.h"
39 #include "base/synchronization/lock.h" 39 #include "base/synchronization/lock.h"
40 #include "base/threading/thread_task_runner_handle.h" 40 #include "base/threading/thread_task_runner_handle.h"
41 #include "base/values.h" 41 #include "base/values.h"
42 #include "chrome/browser/browser_process.h" 42 #include "chrome/browser/browser_process.h"
43 #include "chrome/browser/chrome_notification_types.h" 43 #include "chrome/browser/chrome_notification_types.h"
44 #include "chrome/browser/chromeos/extensions/device_local_account_external_polic y_loader.h" 44 #include "chrome/browser/chromeos/extensions/device_local_account_external_polic y_loader.h"
45 #include "chrome/browser/chromeos/extensions/external_cache.h" 45 #include "chrome/browser/chromeos/extensions/external_cache.h"
46 #include "chrome/browser/chromeos/input_method/input_method_util.h"
47 #include "chrome/browser/chromeos/login/existing_user_controller.h" 46 #include "chrome/browser/chromeos/login/existing_user_controller.h"
48 #include "chrome/browser/chromeos/login/screens/base_screen.h" 47 #include "chrome/browser/chromeos/login/screens/base_screen.h"
49 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 48 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
50 #include "chrome/browser/chromeos/login/session/user_session_manager_test_api.h" 49 #include "chrome/browser/chromeos/login/session/user_session_manager_test_api.h"
51 #include "chrome/browser/chromeos/login/signin_specifics.h" 50 #include "chrome/browser/chromeos/login/signin_specifics.h"
52 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 51 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
53 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 52 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
54 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 53 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
55 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" 54 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
56 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h" 55 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 #include "net/test/embedded_test_server/http_request.h" 136 #include "net/test/embedded_test_server/http_request.h"
138 #include "net/test/embedded_test_server/http_response.h" 137 #include "net/test/embedded_test_server/http_response.h"
139 #include "net/url_request/test_url_fetcher_factory.h" 138 #include "net/url_request/test_url_fetcher_factory.h"
140 #include "net/url_request/url_fetcher_delegate.h" 139 #include "net/url_request/url_fetcher_delegate.h"
141 #include "net/url_request/url_request_status.h" 140 #include "net/url_request/url_request_status.h"
142 #include "testing/gmock/include/gmock/gmock.h" 141 #include "testing/gmock/include/gmock/gmock.h"
143 #include "third_party/icu/source/common/unicode/locid.h" 142 #include "third_party/icu/source/common/unicode/locid.h"
144 #include "ui/base/ime/chromeos/extension_ime_util.h" 143 #include "ui/base/ime/chromeos/extension_ime_util.h"
145 #include "ui/base/ime/chromeos/input_method_descriptor.h" 144 #include "ui/base/ime/chromeos/input_method_descriptor.h"
146 #include "ui/base/ime/chromeos/input_method_manager.h" 145 #include "ui/base/ime/chromeos/input_method_manager.h"
146 #include "ui/base/ime/chromeos/input_method_util.h"
147 #include "ui/base/l10n/l10n_util.h" 147 #include "ui/base/l10n/l10n_util.h"
148 #include "ui/base/window_open_disposition.h" 148 #include "ui/base/window_open_disposition.h"
149 #include "ui/gfx/image/image_skia.h" 149 #include "ui/gfx/image/image_skia.h"
150 #include "ui/views/widget/widget.h" 150 #include "ui/views/widget/widget.h"
151 #include "url/gurl.h" 151 #include "url/gurl.h"
152 152
153 namespace em = enterprise_management; 153 namespace em = enterprise_management;
154 154
155 using chromeos::LoginScreenContext; 155 using chromeos::LoginScreenContext;
156 using testing::InvokeWithoutArgs; 156 using testing::InvokeWithoutArgs;
(...skipping 2275 matching lines...) Expand 10 before | Expand all | Expand 10 after
2432 ASSERT_TRUE(content::ExecuteScript(contents_, 2432 ASSERT_TRUE(content::ExecuteScript(contents_,
2433 "$('tos-accept-button').click();")); 2433 "$('tos-accept-button').click();"));
2434 2434
2435 WaitForSessionStart(); 2435 WaitForSessionStart();
2436 } 2436 }
2437 2437
2438 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2438 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2439 TermsOfServiceDownloadTest, testing::Bool()); 2439 TermsOfServiceDownloadTest, testing::Bool());
2440 2440
2441 } // namespace policy 2441 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698