chrome/browser/ui/app_list/arc/arc_app_test.h - Issue 2248353002: [M53 cherry-pick] Migrate ArcUserDataService into ArcAuthService.

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/app_list/arc/arc_app_test.h

Issue 2248353002: [M53 cherry-pick] Migrate ArcUserDataService into ArcAuthService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785

Patch Set: Created 4 years, 4 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_enterprise_reporting_service.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_test.cc » ('j') | no next file with comments »

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 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_	5 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_

6 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_	6 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_

7	7

8 #include <memory>	8 #include <memory>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 ArcAppListPrefs* arc_app_list_pref_ = nullptr;	83 ArcAppListPrefs* arc_app_list_pref_ = nullptr;

84	84

85 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;	85 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;

86 std::unique_ptr<arc::FakeAppInstance> app_instance_;	86 std::unique_ptr<arc::FakeAppInstance> app_instance_;

87 std::unique_ptr<arc::ArcAuthService> auth_service_;	87 std::unique_ptr<arc::ArcAuthService> auth_service_;

88 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;	88 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;

89 std::vector<arc::mojom::AppInfo> fake_apps_;	89 std::vector<arc::mojom::AppInfo> fake_apps_;

90 std::vector<arc::mojom::ArcPackageInfo> fake_packages_;	90 std::vector<arc::mojom::ArcPackageInfo> fake_packages_;

91 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_;	91 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_;

92	92

	93 bool dbus_thread_manager_initialized_ = false;

	94

93 DISALLOW_COPY_AND_ASSIGN(ArcAppTest);	95 DISALLOW_COPY_AND_ASSIGN(ArcAppTest);

94 };	96 };

95	97

96 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_	98 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_

OLD	NEW