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

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

Issue 1661713002: Remove the rest of HostDesktopType from c/b/ui/browser_finder.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-11
Patch Set: linux adl Created 4 years, 10 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 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/session_state_delegate.h" 5 #include "ash/session/session_state_delegate.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chromeos/login/login_manager_test.h" 8 #include "chrome/browser/chromeos/login/login_manager_test.h"
9 #include "chrome/browser/chromeos/login/startup_utils.h" 9 #include "chrome/browser/chromeos/login/startup_utils.h"
10 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) { 48 IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) {
49 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY, 49 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
50 ash::Shell::GetInstance()->session_state_delegate()-> 50 ash::Shell::GetInstance()->session_state_delegate()->
51 GetSessionState()); 51 GetSessionState());
52 LoginUser(kTestUser); 52 LoginUser(kTestUser);
53 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE, 53 EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
54 ash::Shell::GetInstance()->session_state_delegate()-> 54 ash::Shell::GetInstance()->session_state_delegate()->
55 GetSessionState()); 55 GetSessionState());
56 56
57 Browser* browser = FindAnyBrowser(ProfileManager::GetActiveUserProfile(), 57 Browser* browser =
58 false, 58 chrome::FindAnyBrowser(ProfileManager::GetActiveUserProfile(), false);
59 chrome::HOST_DESKTOP_TYPE_ASH);
60 EXPECT_TRUE(browser != NULL); 59 EXPECT_TRUE(browser != NULL);
61 EXPECT_TRUE(browser->window()->IsActive()); 60 EXPECT_TRUE(browser->window()->IsActive());
62 61
63 gfx::NativeWindow window = browser->window()->GetNativeWindow(); 62 gfx::NativeWindow window = browser->window()->GetNativeWindow();
64 views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); 63 views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
65 views::FocusManager* focus_manager = widget->GetFocusManager(); 64 views::FocusManager* focus_manager = widget->GetFocusManager();
66 EXPECT_TRUE(focus_manager != NULL); 65 EXPECT_TRUE(focus_manager != NULL);
67 66
68 const views::View* focused_view = focus_manager->GetFocusedView(); 67 const views::View* focused_view = focus_manager->GetFocusedView();
69 EXPECT_TRUE(focused_view != NULL); 68 EXPECT_TRUE(focused_view != NULL);
70 EXPECT_EQ(VIEW_ID_OMNIBOX, focused_view->id()); 69 EXPECT_EQ(VIEW_ID_OMNIBOX, focused_view->id());
71 } 70 }
72 71
73 } // namespace chromeos 72 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_main_browsertest.cc ('k') | chrome/browser/chromeos/options/network_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698