chrome/browser/chromeos/login/screens/network_screen_browsertest.cc - Issue 647043004: WizardScreen is merged to BaseScreen.

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/screens/network_screen_browsertest.cc

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Created 6 years, 2 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

« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen.cc ('k') | chrome/browser/chromeos/login/screens/reset_screen.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.h"

6 #include "chrome/browser/chromeos/login/helper.h"	6 #include "chrome/browser/chromeos/login/helper.h"

	7 #include "chrome/browser/chromeos/login/screens/base_screen.h"

7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"	8 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"

8 #include "chrome/browser/chromeos/login/screens/network_screen.h"	9 #include "chrome/browser/chromeos/login/screens/network_screen.h"

9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"

10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"	10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"

11 #include "chrome/browser/chromeos/login/wizard_controller.h"	11 #include "chrome/browser/chromeos/login/wizard_controller.h"

12 #include "chrome/test/base/ui_test_utils.h"	12 #include "chrome/test/base/ui_test_utils.h"

13 #include "chromeos/dbus/dbus_thread_manager.h"	13 #include "chromeos/dbus/dbus_thread_manager.h"

14 #include "chromeos/dbus/fake_session_manager_client.h"	14 #include "chromeos/dbus/fake_session_manager_client.h"

15 #include "content/public/test/test_utils.h"	15 #include "content/public/test/test_utils.h"

16 #include "testing/gmock/include/gmock/gmock.h"	16 #include "testing/gmock/include/gmock/gmock.h"

17 #include "testing/gtest/include/gtest/gtest.h"	17 #include "testing/gtest/include/gtest/gtest.h"

18 #include "third_party/cros_system_api/dbus/service_constants.h"	18 #include "third_party/cros_system_api/dbus/service_constants.h"

19 #include "ui/views/controls/button/button.h"	19 #include "ui/views/controls/button/button.h"

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 // EXPECT_FALSE(actor_->IsConnecting());	142 // EXPECT_FALSE(actor_->IsConnecting());

143 network_screen_->OnConnectionTimeout();	143 network_screen_->OnConnectionTimeout();

144	144

145 // Close infobubble with error message - it makes the test stable.	145 // Close infobubble with error message - it makes the test stable.

146 // EXPECT_FALSE(actor_->IsContinueEnabled());	146 // EXPECT_FALSE(actor_->IsContinueEnabled());

147 // EXPECT_FALSE(actor_->IsConnecting());	147 // EXPECT_FALSE(actor_->IsConnecting());

148 // actor_->ClearErrors();	148 // actor_->ClearErrors();

149 }	149 }

150	150

151 } // namespace chromeos	151 } // namespace chromeos

OLD	NEW