#include <string>
#include <vector>
-#include "apps/app_window_registry.h"
-#include "apps/ui/native_app_window.h"
#include "ash/shell.h"
#include "ash/system/chromeos/session/logout_confirmation_controller.h"
#include "ash/system/chromeos/session/logout_confirmation_dialog.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/command_line.h"
-#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/location.h"
#include "chrome/browser/chromeos/extensions/external_cache.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
+#include "chrome/browser/chromeos/login/signin_specifics.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
#include "crypto/rsa_private_key.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
+#include "extensions/browser/app_window/native_app_window.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/management_policy.h"
#include "extensions/browser/notification_types.h"
const char kAccountId2[] = "dla2@example.com";
const char kDisplayName1[] = "display name 1";
const char kDisplayName2[] = "display name 2";
-const char* kStartupURLs[] = {
+const char* const kStartupURLs[] = {
"chrome://policy",
"chrome://about",
};
const char kExternalData[] = "External data";
const char kExternalDataURL[] = "http://localhost/external_data";
-const char* kSingleRecommendedLocale[] = {
+const char* const kSingleRecommendedLocale[] = {
"el",
};
-const char* kRecommendedLocales1[] = {
+const char* const kRecommendedLocales1[] = {
"pl",
"et",
"en-US",
};
-const char* kRecommendedLocales2[] = {
+const char* const kRecommendedLocales2[] = {
"fr",
"nl",
};
-const char* kInvalidRecommendedLocale[] = {
+const char* const kInvalidRecommendedLocale[] = {
"xx",
};
const char kPublicSessionLocale[] = "de";
http_response->set_code(net::HTTP_OK);
http_response->set_content(content);
http_response->set_content_type("text/xml");
- return http_response.PassAs<net::test_server::HttpResponse>();
+ return http_response.Pass();
}
DictionaryPrefValueWaiter::DictionaryPrefValueWaiter(
class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
public user_manager::UserManager::Observer,
public chrome::BrowserListObserver,
- public apps::AppWindowRegistry::Observer {
+ public extensions::AppWindowRegistry::Observer {
protected:
DeviceLocalAccountTest()
: user_id_1_(GenerateDeviceLocalAccountUserId(
virtual ~DeviceLocalAccountTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
// Configure and start the test server.
scoped_ptr<crypto::RSAPrivateKey> signing_key(
PolicyBuilder::CreateTestSigningKey());
DevicePolicyCrosBrowserTest::SetUp();
}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
DevicePolicyCrosBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(chromeos::switches::kLoginManager);
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
test_server_.GetServiceURL().spec());
}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
// Clear command-line arguments (but keep command-line switches) so the
InitializePolicy();
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
DevicePolicyCrosBrowserTest::SetUpOnMainThread();
initial_locale_ = g_browser_process->GetApplicationLocale();
wizard_controller->SkipToLoginForTesting(LoginScreenContext());
}
- virtual void TearDownOnMainThread() OVERRIDE {
+ virtual void TearDownOnMainThread() override {
BrowserList::RemoveObserver(this);
// This shuts down the login UI.
}
virtual void LocalStateChanged(
- user_manager::UserManager* user_manager) OVERRIDE {
+ user_manager::UserManager* user_manager) override {
if (run_loop_)
run_loop_->Quit();
}
- virtual void OnBrowserRemoved(Browser* browser) OVERRIDE {
+ virtual void OnBrowserRemoved(Browser* browser) override {
if (run_loop_)
run_loop_->Quit();
}
- virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE {
+ virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override {
if (run_loop_)
run_loop_->Quit();
}
- virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE {
+ virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override {
if (run_loop_)
run_loop_->Quit();
}
kAccountId1, device_local_account_policy_.GetBlob());
}
- void SetRecommendedLocales(const char* recommended_locales[],
+ void SetRecommendedLocales(const char* const recommended_locales[],
size_t array_size) {
em::StringListPolicyProto* session_locales_proto =
device_local_account_policy_.payload().mutable_sessionlocales();
user_id_1_);
user_context.SetPublicSessionLocale(locale);
user_context.SetPublicSessionInputMethod(input_method);
- controller->LoginAsPublicSession(user_context);
+ controller->Login(user_context, chromeos::SigninSpecifics());
}
void WaitForSessionStart() {
&layouts_from_locale);
ASSERT_FALSE(layouts_from_locale.empty());
EXPECT_EQ(layouts_from_locale.front(),
- input_method_manager->GetCurrentInputMethod().id());
+ input_method_manager->GetActiveIMEState()
+ ->GetCurrentInputMethod()
+ .id());
}
const std::string user_id_1_;
Profile* profile = GetProfileForTest();
ASSERT_TRUE(profile);
- apps::AppWindowRegistry* app_window_registry =
- apps::AppWindowRegistry::Get(profile);
+ extensions::AppWindowRegistry* app_window_registry =
+ extensions::AppWindowRegistry::Get(profile);
app_window_registry->AddObserver(this);
// Verify that the logout confirmation dialog is not showing.
EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale),
icu::Locale::getDefault().getLanguage());
EXPECT_EQ(public_session_input_method_id_,
- chromeos::input_method::InputMethodManager::Get()->
- GetCurrentInputMethod().id());
+ chromeos::input_method::InputMethodManager::Get()
+ ->GetActiveIMEState()
+ ->GetCurrentInputMethod()
+ .id());
}
IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, OneRecommendedLocale) {
EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale),
icu::Locale::getDefault().getLanguage());
EXPECT_EQ(public_session_input_method_id_,
- chromeos::input_method::InputMethodManager::Get()->
- GetCurrentInputMethod().id());
+ chromeos::input_method::InputMethodManager::Get()
+ ->GetActiveIMEState()
+ ->GetCurrentInputMethod()
+ .id());
}
IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, InvalidRecommendedLocale) {
EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale),
icu::Locale::getDefault().getLanguage());
EXPECT_EQ(public_session_input_method_id_,
- chromeos::input_method::InputMethodManager::Get()->
- GetCurrentInputMethod().id());
+ chromeos::input_method::InputMethodManager::Get()
+ ->GetActiveIMEState()
+ ->GetCurrentInputMethod()
+ .id());
// Click the accept button.
ASSERT_TRUE(content::ExecuteScript(contents_,
EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale),
icu::Locale::getDefault().getLanguage());
EXPECT_EQ(public_session_input_method_id_,
- chromeos::input_method::InputMethodManager::Get()->
- GetCurrentInputMethod().id());
+ chromeos::input_method::InputMethodManager::Get()
+ ->GetActiveIMEState()
+ ->GetCurrentInputMethod()
+ .id());
}
class TermsOfServiceDownloadTest : public DeviceLocalAccountTest,
projects / platform / framework / web / crosswalk.git / blobdiff