Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: chrome/browser/ui/app_list/arc/arc_app_test.h

Issue 2545533002: [Merge-M56] arc: Fix duplicate icons in app launcher in case of crash. (Closed)
Patch Set: fix resolution Created 4 years 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
OLDNEW
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 arc::FakeAppInstance* app_instance() { return app_instance_.get(); } 78 arc::FakeAppInstance* app_instance() { return app_instance_.get(); }
79 79
80 ArcAppListPrefs* arc_app_list_prefs() { return arc_app_list_pref_; } 80 ArcAppListPrefs* arc_app_list_prefs() { return arc_app_list_pref_; }
81 81
82 arc::ArcAuthService* arc_auth_service() { return auth_service_.get(); } 82 arc::ArcAuthService* arc_auth_service() { return auth_service_.get(); }
83 83
84 private: 84 private:
85 const user_manager::User* CreateUserAndLogin(); 85 const user_manager::User* CreateUserAndLogin();
86 bool FindPackage(const arc::mojom::ArcPackageInfo& package); 86 bool FindPackage(const arc::mojom::ArcPackageInfo& package);
87 void CreateFakeAppsAndPackages();
87 88
88 // Unowned pointer. 89 // Unowned pointer.
89 Profile* profile_ = nullptr; 90 Profile* profile_ = nullptr;
90 91
91 ArcAppListPrefs* arc_app_list_pref_ = nullptr; 92 ArcAppListPrefs* arc_app_list_pref_ = nullptr;
92 93
93 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_; 94 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;
94 std::unique_ptr<arc::FakeAppInstance> app_instance_; 95 std::unique_ptr<arc::FakeAppInstance> app_instance_;
95 std::unique_ptr<arc::ArcAuthService> auth_service_; 96 std::unique_ptr<arc::ArcAuthService> auth_service_;
96 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; 97 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
97 std::vector<arc::mojom::AppInfo> fake_apps_; 98 std::vector<arc::mojom::AppInfo> fake_apps_;
98 std::vector<arc::mojom::AppInfo> fake_default_apps_; 99 std::vector<arc::mojom::AppInfo> fake_default_apps_;
99 std::vector<arc::mojom::ArcPackageInfo> fake_packages_; 100 std::vector<arc::mojom::ArcPackageInfo> fake_packages_;
100 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_; 101 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_;
101 102
102 bool dbus_thread_manager_initialized_ = false; 103 bool dbus_thread_manager_initialized_ = false;
103 104
104 DISALLOW_COPY_AND_ASSIGN(ArcAppTest); 105 DISALLOW_COPY_AND_ASSIGN(ArcAppTest);
105 }; 106 };
106 107
107 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ 108 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698