chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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/first_run/chromeos_first_run_browsertest.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 9 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/arc/arc_support_host.cc ('k') | chrome/browser/chromeos/first_run/drive_first_run_controller.cc » ('j') | no next file with comments »

OLD	NEW
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/common/system/tray/system_tray.h"

6 #include "ash/first_run/first_run_helper.h"	5 #include "ash/first_run/first_run_helper.h"

7 #include "ash/shell.h"	6 #include "ash/shell.h"

	7 #include "ash/system/tray/system_tray.h"

8 #include "chrome/browser/chromeos/first_run/first_run.h"	8 #include "chrome/browser/chromeos/first_run/first_run.h"

9 #include "chrome/browser/chromeos/first_run/first_run_controller.h"	9 #include "chrome/browser/chromeos/first_run/first_run_controller.h"

10 #include "chrome/browser/chromeos/first_run/step_names.h"	10 #include "chrome/browser/chromeos/first_run/step_names.h"

11 #include "chrome/browser/chromeos/login/test/js_checker.h"	11 #include "chrome/browser/chromeos/login/test/js_checker.h"

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

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

14	14

15 namespace chromeos {	15 namespace chromeos {

16	16

17 class FirstRunUIBrowserTest : public InProcessBrowserTest,	17 class FirstRunUIBrowserTest : public InProcessBrowserTest,

(...skipping 116 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
134 WaitForFinalization();	134 WaitForFinalization();

135 content::RunAllPendingInMessageLoop();	135 content::RunAllPendingInMessageLoop();

136 EXPECT_EQ(controller(), (void*)NULL);	136 EXPECT_EQ(controller(), (void*)NULL);

137 // shell_helper() is destructed already, thats why we call Shell directly.	137 // shell_helper() is destructed already, thats why we call Shell directly.

138 EXPECT_FALSE(ash::Shell::GetInstance()->GetPrimarySystemTray()->	138 EXPECT_FALSE(ash::Shell::GetInstance()->GetPrimarySystemTray()->

139 HasSystemBubble());	139 HasSystemBubble());

140 }	140 }

141	141

142 } // namespace chromeos	142 } // namespace chromeos

143	143

OLD	NEW