chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc - Issue 2734683002: chromeos: Move files in //ash/common to //ash, part 2

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/ui/ash/launcher/arc_app_launcher_browsertest.cc

Issue 2734683002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: 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

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/shelf/shelf_delegate.h"

6 #include "ash/common/wm_shell.h"	5 #include "ash/common/wm_shell.h"

	6 #include "ash/shelf/shelf_delegate.h"

7 #include "ash/wm/window_util.h"	7 #include "ash/wm/window_util.h"

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/run_loop.h"	9 #include "base/run_loop.h"

10 #include "base/strings/stringprintf.h"	10 #include "base/strings/stringprintf.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/browser/chromeos/arc/arc_auth_notification.h"	12 #include "chrome/browser/chromeos/arc/arc_auth_notification.h"

13 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"	13 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"

14 #include "chrome/browser/chromeos/arc/arc_session_manager.h"	14 #include "chrome/browser/chromeos/arc/arc_session_manager.h"

15 #include "chrome/browser/chromeos/arc/arc_util.h"	15 #include "chrome/browser/chromeos/arc/arc_util.h"

16 #include "chrome/browser/extensions/extension_browsertest.h"	16 #include "chrome/browser/extensions/extension_browsertest.h"

(...skipping 529 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
546 app_host()->OnTaskDestroyed(2);	546 app_host()->OnTaskDestroyed(2);

547 EXPECT_EQ(controller2, GetAppItemController(shelf_id2));	547 EXPECT_EQ(controller2, GetAppItemController(shelf_id2));

548 // Destroy task #2, this kills shelf group 2	548 // Destroy task #2, this kills shelf group 2

549 app_host()->OnTaskDestroyed(3);	549 app_host()->OnTaskDestroyed(3);

550 EXPECT_FALSE(GetAppItemController(shelf_id2));	550 EXPECT_FALSE(GetAppItemController(shelf_id2));

551	551

552 // Disable ARC, this removes app and as result kills shelf group 3.	552 // Disable ARC, this removes app and as result kills shelf group 3.

553 arc::SetArcPlayStoreEnabledForProfile(profile(), false);	553 arc::SetArcPlayStoreEnabledForProfile(profile(), false);

554 EXPECT_FALSE(GetAppItemController(shelf_id3));	554 EXPECT_FALSE(GetAppItemController(shelf_id3));

555 }	555 }

OLD	NEW