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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 1921403002: Pin apps from prefs on the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only include arc for cros. Created 4 years, 7 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
OLDNEW
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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 13 matching lines...) Expand all
24 #include "base/files/file_path.h" 24 #include "base/files/file_path.h"
25 #include "base/macros.h" 25 #include "base/macros.h"
26 #include "base/memory/ptr_util.h" 26 #include "base/memory/ptr_util.h"
27 #include "base/message_loop/message_loop.h" 27 #include "base/message_loop/message_loop.h"
28 #include "base/strings/utf_string_conversions.h" 28 #include "base/strings/utf_string_conversions.h"
29 #include "base/values.h" 29 #include "base/values.h"
30 #include "build/build_config.h" 30 #include "build/build_config.h"
31 #include "chrome/browser/extensions/extension_service.h" 31 #include "chrome/browser/extensions/extension_service.h"
32 #include "chrome/browser/extensions/test_extension_system.h" 32 #include "chrome/browser/extensions/test_extension_system.h"
33 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 33 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
34 #include "chrome/browser/ui/ash/launcher/app_tab_helper.h"
34 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h" 35 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h"
35 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 36 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
36 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 37 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
37 #include "chrome/browser/ui/browser.h" 38 #include "chrome/browser/ui/browser.h"
38 #include "chrome/browser/ui/browser_commands.h" 39 #include "chrome/browser/ui/browser_commands.h"
39 #include "chrome/browser/ui/browser_finder.h" 40 #include "chrome/browser/ui/browser_finder.h"
40 #include "chrome/browser/ui/browser_list.h" 41 #include "chrome/browser/ui/browser_list.h"
41 #include "chrome/browser/ui/browser_tabstrip.h" 42 #include "chrome/browser/ui/browser_tabstrip.h"
42 #include "chrome/browser/ui/tabs/tab_strip_model.h" 43 #include "chrome/browser/ui/tabs/tab_strip_model.h"
43 #include "chrome/common/extensions/extension_constants.h" 44 #include "chrome/common/extensions/extension_constants.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 185
185 private: 186 private:
186 int fetch_count_ = 0; 187 int fetch_count_ = 0;
187 int clear_count_ = 0; 188 int clear_count_ = 0;
188 std::set<std::string> supported_apps_; 189 std::set<std::string> supported_apps_;
189 190
190 DISALLOW_COPY_AND_ASSIGN(TestAppIconLoaderImpl); 191 DISALLOW_COPY_AND_ASSIGN(TestAppIconLoaderImpl);
191 }; 192 };
192 193
193 // Test implementation of AppTabHelper. 194 // Test implementation of AppTabHelper.
194 class TestAppTabHelperImpl : public ChromeLauncherController::AppTabHelper { 195 class TestAppTabHelperImpl : public AppTabHelper {
195 public: 196 public:
196 TestAppTabHelperImpl() {} 197 TestAppTabHelperImpl() {}
197 ~TestAppTabHelperImpl() override {} 198 ~TestAppTabHelperImpl() override {}
198 199
199 // Sets the id for the specified tab. The id is removed if Remove() is 200 // Sets the id for the specified tab. The id is removed if Remove() is
200 // invoked. 201 // invoked.
201 void SetAppID(content::WebContents* tab, const std::string& id) { 202 void SetAppID(content::WebContents* tab, const std::string& id) {
202 tab_id_map_[tab] = id; 203 tab_id_map_[tab] = id;
203 } 204 }
204 205
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 } 494 }
494 495
495 void SetAppIconLoaders(std::unique_ptr<AppIconLoader> loader1, 496 void SetAppIconLoaders(std::unique_ptr<AppIconLoader> loader1,
496 std::unique_ptr<AppIconLoader> loader2) { 497 std::unique_ptr<AppIconLoader> loader2) {
497 std::vector<std::unique_ptr<AppIconLoader>> loaders; 498 std::vector<std::unique_ptr<AppIconLoader>> loaders;
498 loaders.push_back(std::move(loader1)); 499 loaders.push_back(std::move(loader1));
499 loaders.push_back(std::move(loader2)); 500 loaders.push_back(std::move(loader2));
500 launcher_controller_->SetAppIconLoadersForTest(loaders); 501 launcher_controller_->SetAppIconLoadersForTest(loaders);
501 } 502 }
502 503
503 void SetAppTabHelper(ChromeLauncherController::AppTabHelper* helper) { 504 void SetAppTabHelper(AppTabHelper* helper) {
504 launcher_controller_->SetAppTabHelperForTest(helper); 505 launcher_controller_->SetAppTabHelperForTest(helper);
505 } 506 }
506 507
507 void SetShelfItemDelegateManager(ash::ShelfItemDelegateManager* manager) { 508 void SetShelfItemDelegateManager(ash::ShelfItemDelegateManager* manager) {
508 launcher_controller_->SetShelfItemDelegateManagerForTest(manager); 509 launcher_controller_->SetShelfItemDelegateManagerForTest(manager);
509 } 510 }
510 511
511 void InsertPrefValue(base::ListValue* pref_value, 512 void InsertPrefValue(base::ListValue* pref_value,
512 int index, 513 int index,
513 const std::string& extension_id) { 514 const std::string& extension_id) {
(...skipping 2421 matching lines...) Expand 10 before | Expand all | Expand 10 after
2935 EXPECT_EQ(1, app_icon_loader1->clear_count()); 2936 EXPECT_EQ(1, app_icon_loader1->clear_count());
2936 EXPECT_EQ(1, app_icon_loader2->fetch_count()); 2937 EXPECT_EQ(1, app_icon_loader2->fetch_count());
2937 EXPECT_EQ(1, app_icon_loader2->clear_count()); 2938 EXPECT_EQ(1, app_icon_loader2->clear_count());
2938 2939
2939 launcher_controller_->CloseLauncherItem(shelfId3); 2940 launcher_controller_->CloseLauncherItem(shelfId3);
2940 EXPECT_EQ(1, app_icon_loader1->fetch_count()); 2941 EXPECT_EQ(1, app_icon_loader1->fetch_count());
2941 EXPECT_EQ(1, app_icon_loader1->clear_count()); 2942 EXPECT_EQ(1, app_icon_loader1->clear_count());
2942 EXPECT_EQ(1, app_icon_loader2->fetch_count()); 2943 EXPECT_EQ(1, app_icon_loader2->fetch_count());
2943 EXPECT_EQ(1, app_icon_loader2->clear_count()); 2944 EXPECT_EQ(1, app_icon_loader2->clear_count());
2944 } 2945 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698