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

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

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 <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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #include "chrome/browser/ui/tabs/tab_strip_model.h" 79 #include "chrome/browser/ui/tabs/tab_strip_model.h"
80 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 80 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
81 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 81 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
82 #include "chrome/common/chrome_paths.h" 82 #include "chrome/common/chrome_paths.h"
83 #include "chrome/common/extensions/extension_constants.h" 83 #include "chrome/common/extensions/extension_constants.h"
84 #include "chrome/grit/chromium_strings.h" 84 #include "chrome/grit/chromium_strings.h"
85 #include "chrome/grit/generated_resources.h" 85 #include "chrome/grit/generated_resources.h"
86 #include "chromeos/chromeos_paths.h" 86 #include "chromeos/chromeos_paths.h"
87 #include "chromeos/chromeos_switches.h" 87 #include "chromeos/chromeos_switches.h"
88 #include "chromeos/dbus/fake_session_manager_client.h" 88 #include "chromeos/dbus/fake_session_manager_client.h"
89 #include "chromeos/ime/extension_ime_util.h"
90 #include "chromeos/ime/input_method_descriptor.h"
91 #include "chromeos/ime/input_method_manager.h"
89 #include "chromeos/login/auth/mock_auth_status_consumer.h" 92 #include "chromeos/login/auth/mock_auth_status_consumer.h"
90 #include "chromeos/login/auth/user_context.h" 93 #include "chromeos/login/auth/user_context.h"
91 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 94 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
92 #include "components/policy/core/common/cloud/cloud_policy_core.h" 95 #include "components/policy/core/common/cloud/cloud_policy_core.h"
93 #include "components/policy/core/common/cloud/cloud_policy_store.h" 96 #include "components/policy/core/common/cloud/cloud_policy_store.h"
94 #include "components/policy/core/common/cloud/policy_builder.h" 97 #include "components/policy/core/common/cloud/policy_builder.h"
95 #include "components/policy/core/common/external_data_fetcher.h" 98 #include "components/policy/core/common/external_data_fetcher.h"
96 #include "components/policy/core/common/policy_map.h" 99 #include "components/policy/core/common/policy_map.h"
97 #include "components/policy/core/common/policy_namespace.h" 100 #include "components/policy/core/common/policy_namespace.h"
98 #include "components/policy/core/common/policy_service.h" 101 #include "components/policy/core/common/policy_service.h"
(...skipping 22 matching lines...) Expand all
121 #include "net/http/http_status_code.h" 124 #include "net/http/http_status_code.h"
122 #include "net/test/embedded_test_server/embedded_test_server.h" 125 #include "net/test/embedded_test_server/embedded_test_server.h"
123 #include "net/test/embedded_test_server/http_request.h" 126 #include "net/test/embedded_test_server/http_request.h"
124 #include "net/test/embedded_test_server/http_response.h" 127 #include "net/test/embedded_test_server/http_response.h"
125 #include "net/url_request/test_url_fetcher_factory.h" 128 #include "net/url_request/test_url_fetcher_factory.h"
126 #include "net/url_request/url_fetcher_delegate.h" 129 #include "net/url_request/url_fetcher_delegate.h"
127 #include "net/url_request/url_request_status.h" 130 #include "net/url_request/url_request_status.h"
128 #include "policy/policy_constants.h" 131 #include "policy/policy_constants.h"
129 #include "testing/gmock/include/gmock/gmock.h" 132 #include "testing/gmock/include/gmock/gmock.h"
130 #include "third_party/icu/source/common/unicode/locid.h" 133 #include "third_party/icu/source/common/unicode/locid.h"
131 #include "ui/base/ime/chromeos/extension_ime_util.h"
132 #include "ui/base/ime/chromeos/input_method_descriptor.h"
133 #include "ui/base/ime/chromeos/input_method_manager.h"
134 #include "ui/base/l10n/l10n_util.h" 134 #include "ui/base/l10n/l10n_util.h"
135 #include "ui/base/window_open_disposition.h" 135 #include "ui/base/window_open_disposition.h"
136 #include "ui/gfx/image/image_skia.h" 136 #include "ui/gfx/image/image_skia.h"
137 #include "ui/views/widget/widget.h" 137 #include "ui/views/widget/widget.h"
138 #include "url/gurl.h" 138 #include "url/gurl.h"
139 139
140 namespace em = enterprise_management; 140 namespace em = enterprise_management;
141 141
142 using chromeos::LoginScreenContext; 142 using chromeos::LoginScreenContext;
143 using testing::InvokeWithoutArgs; 143 using testing::InvokeWithoutArgs;
(...skipping 1941 matching lines...) Expand 10 before | Expand all | Expand 10 after
2085 ASSERT_TRUE(content::ExecuteScript(contents_, 2085 ASSERT_TRUE(content::ExecuteScript(contents_,
2086 "$('tos-accept-button').click();")); 2086 "$('tos-accept-button').click();"));
2087 2087
2088 WaitForSessionStart(); 2088 WaitForSessionStart();
2089 } 2089 }
2090 2090
2091 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2091 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2092 TermsOfServiceDownloadTest, testing::Bool()); 2092 TermsOfServiceDownloadTest, testing::Bool());
2093 2093
2094 } // namespace policy 2094 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_display.cc ('k') | chrome/browser/chromeos/preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698