chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc - Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc

Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/compiler_specific.h"	6 #include "base/compiler_specific.h"

7 #include "base/logging.h"	7 #include "base/logging.h"

	8 #include "base/macros.h"

8 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

9 #include "chrome/browser/chromeos/login/login_manager_test.h"	10 #include "chrome/browser/chromeos/login/login_manager_test.h"

10 #include "chrome/browser/chromeos/login/screens/error_screen.h"	11 #include "chrome/browser/chromeos/login/screens/error_screen.h"

11 #include "chrome/browser/chromeos/login/screens/network_error_view.h"	12 #include "chrome/browser/chromeos/login/screens/network_error_view.h"

12 #include "chrome/browser/chromeos/login/startup_utils.h"	13 #include "chrome/browser/chromeos/login/startup_utils.h"

13 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"	14 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"

14 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"	15 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"

15 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	16 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

16 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"	17 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"

17 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"	18 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"

(...skipping 207 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
225	226

226 ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN, strategy_id());	227 ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN, strategy_id());

227 network_portal_detector()->NotifyObserversForTesting();	228 network_portal_detector()->NotifyObserversForTesting();

228 OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();	229 OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();

229 ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN, strategy_id());	230 ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN, strategy_id());

230	231

231 error_screen->ShowCaptivePortal();	232 error_screen->ShowCaptivePortal();

232 }	233 }

233	234

234 } // namespace chromeos	235 } // namespace chromeos

OLD	NEW