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

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

Issue 2520173002: arc: Fix duplicate icons in app launcher in case of crash. (Closed)
Patch Set: nits 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::ArcSessionManager* arc_session_manager() { 82 arc::ArcSessionManager* arc_session_manager() {
83 return arc_session_manager_.get(); 83 return arc_session_manager_.get();
84 } 84 }
85 85
86 private: 86 private:
87 const user_manager::User* CreateUserAndLogin(); 87 const user_manager::User* CreateUserAndLogin();
88 bool FindPackage(const arc::mojom::ArcPackageInfo& package); 88 bool FindPackage(const arc::mojom::ArcPackageInfo& package);
89 void CreateFakeAppsAndPackages();
89 90
90 // Unowned pointer. 91 // Unowned pointer.
91 Profile* profile_ = nullptr; 92 Profile* profile_ = nullptr;
92 93
93 ArcAppListPrefs* arc_app_list_pref_ = nullptr; 94 ArcAppListPrefs* arc_app_list_pref_ = nullptr;
94 95
95 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_; 96 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;
96 std::unique_ptr<arc::FakeAppInstance> app_instance_; 97 std::unique_ptr<arc::FakeAppInstance> app_instance_;
97 std::unique_ptr<arc::ArcSessionManager> arc_session_manager_; 98 std::unique_ptr<arc::ArcSessionManager> arc_session_manager_;
98 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; 99 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
99 std::vector<arc::mojom::AppInfo> fake_apps_; 100 std::vector<arc::mojom::AppInfo> fake_apps_;
100 std::vector<arc::mojom::AppInfo> fake_default_apps_; 101 std::vector<arc::mojom::AppInfo> fake_default_apps_;
101 std::vector<arc::mojom::ArcPackageInfo> fake_packages_; 102 std::vector<arc::mojom::ArcPackageInfo> fake_packages_;
102 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_; 103 std::vector<arc::mojom::ShortcutInfo> fake_shortcuts_;
103 104
104 bool dbus_thread_manager_initialized_ = false; 105 bool dbus_thread_manager_initialized_ = false;
105 106
106 DISALLOW_COPY_AND_ASSIGN(ArcAppTest); 107 DISALLOW_COPY_AND_ASSIGN(ArcAppTest);
107 }; 108 };
108 109
109 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ 110 #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