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

Side by Side Diff: chrome/browser/chromeos/login/session_login_browsertest.cc

Issue 231123002: Notify about major session changes events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit_tests Created 6 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "ash/session_state_delegate.h"
6 #include "ash/shell.h"
5 #include "chrome/browser/chromeos/login/login_manager_test.h" 7 #include "chrome/browser/chromeos/login/login_manager_test.h"
6 #include "chrome/browser/chromeos/login/startup_utils.h" 8 #include "chrome/browser/chromeos/login/startup_utils.h"
7 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
8 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_finder.h" 11 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/view_ids.h" 13 #include "chrome/browser/ui/view_ids.h"
12 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
13 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/views/focus/focus_manager.h" 16 #include "ui/views/focus/focus_manager.h"
(...skipping 13 matching lines...) Expand all
28 virtual ~BrowserLoginTest() {} 30 virtual ~BrowserLoginTest() {}
29 31
30 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 32 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
31 LoginManagerTest::SetUpCommandLine(command_line); 33 LoginManagerTest::SetUpCommandLine(command_line);
32 command_line->AppendSwitch(::switches::kCreateBrowserOnStartupForTests); 34 command_line->AppendSwitch(::switches::kCreateBrowserOnStartupForTests);
33 } 35 }
34 }; 36 };
35 37
36 IN_PROC_BROWSER_TEST_F(BrowserLoginTest, PRE_BrowserActive) { 38 IN_PROC_BROWSER_TEST_F(BrowserLoginTest, PRE_BrowserActive) {
37 RegisterUser(kTestUser); 39 RegisterUser(kTestUser);
40 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
41 ash::Shell::GetInstance()->session_state_delegate()->
42 GetSessionState());
38 chromeos::StartupUtils::MarkOobeCompleted(); 43 chromeos::StartupUtils::MarkOobeCompleted();
39 } 44 }
40 45
41 IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) { 46 IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) {
47 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
48 ash::Shell::GetInstance()->session_state_delegate()->
49 GetSessionState());
42 LoginUser(kTestUser); 50 LoginUser(kTestUser);
51 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
52 ash::Shell::GetInstance()->session_state_delegate()->
53 GetSessionState());
54
43 Browser* browser = FindAnyBrowser(ProfileManager::GetActiveUserProfile(), 55 Browser* browser = FindAnyBrowser(ProfileManager::GetActiveUserProfile(),
44 false, 56 false,
45 chrome::HOST_DESKTOP_TYPE_ASH); 57 chrome::HOST_DESKTOP_TYPE_ASH);
46 EXPECT_TRUE(browser != NULL); 58 EXPECT_TRUE(browser != NULL);
47 EXPECT_TRUE(browser->window()->IsActive()); 59 EXPECT_TRUE(browser->window()->IsActive());
48 60
49 views::FocusManager* focus_manager = browser->window()-> 61 views::FocusManager* focus_manager = browser->window()->
50 GetBrowserWindowTesting()->GetTabContentsContainerView()-> 62 GetBrowserWindowTesting()->GetTabContentsContainerView()->
51 GetFocusManager(); 63 GetFocusManager();
52 EXPECT_TRUE(focus_manager != NULL); 64 EXPECT_TRUE(focus_manager != NULL);
53 65
54 const views::View* focused_view = focus_manager->GetFocusedView(); 66 const views::View* focused_view = focus_manager->GetFocusedView();
55 EXPECT_TRUE(focused_view != NULL); 67 EXPECT_TRUE(focused_view != NULL);
56 EXPECT_EQ(VIEW_ID_OMNIBOX, focused_view->id()); 68 EXPECT_EQ(VIEW_ID_OMNIBOX, focused_view->id());
57 } 69 }
58 70
59 } // namespace chromeos 71 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/test/test_session_state_delegate.cc ('k') | chrome/browser/chromeos/login/user_adding_screen_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698