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

Unified Diff: chrome/browser/chromeos/login/session_login_browsertest.cc

Issue 22887021: Pass focus to browser after login. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: return ash changes back Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/session_login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/session_login_browsertest.cc b/chrome/browser/chromeos/login/session_login_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9e4430b017282920b8ac7699590fc01c9030c423
--- /dev/null
+++ b/chrome/browser/chromeos/login/session_login_browsertest.cc
@@ -0,0 +1,42 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/login/login_manager_test.h"
+#include "chrome/browser/chromeos/login/startup_utils.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_switches.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
oshima 2013/08/20 14:56:01 namespace chromeos {
Nikita (slow) 2013/08/20 16:04:39 Done.
+namespace {
+
+const char* kTestUser = "test-user@gmail.com";
oshima 2013/08/20 14:56:01 char[]
Nikita (slow) 2013/08/20 16:04:39 Done.
+
+} // anonymous namespace
+
+class BrowserLoginTest : public chromeos::LoginManagerTest {
+ public:
+ BrowserLoginTest() : LoginManagerTest(true) {}
oshima 2013/08/20 14:56:01 virtual BrowserLOginTest() {}
Nikita (slow) 2013/08/20 16:04:39 Do you mean virtual destructor?
oshima 2013/08/20 17:52:47 yep sorry for typo.
Nikita (slow) 2013/08/20 18:04:21 Done.
+
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ LoginManagerTest::SetUpCommandLine(command_line);
+ command_line->AppendSwitch(::switches::kCreateBrowserOnStartupForTests);
+ }
+};
+
+IN_PROC_BROWSER_TEST_F(BrowserLoginTest, PRE_BrowserActive) {
+ RegisterUser(kTestUser);
+ chromeos::StartupUtils::MarkOobeCompleted();
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) {
+ LoginUser(kTestUser);
+ Browser* browser = FindAnyBrowser(ProfileManager::GetDefaultProfile(),
+ false,
+ chrome::HOST_DESKTOP_TYPE_ASH);
+ EXPECT_TRUE(browser != NULL);
+ EXPECT_TRUE(browser->window()->IsActive());
oshima 2013/08/20 14:56:01 can you test if the omnibox has focus as well? (th
Nikita (slow) 2013/08/20 16:04:39 Done.
+}

Powered by Google App Engine
This is Rietveld 408576698