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

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

Issue 2691043002: Discard pinning an app with non-empty launcher id. (Closed)
Patch Set: Created 3 years, 10 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_impl.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/extensions/extension_service.h" 47 #include "chrome/browser/extensions/extension_service.h"
48 #include "chrome/browser/extensions/test_extension_system.h" 48 #include "chrome/browser/extensions/test_extension_system.h"
49 #include "chrome/browser/lifetime/scoped_keep_alive.h" 49 #include "chrome/browser/lifetime/scoped_keep_alive.h"
50 #include "chrome/browser/prefs/browser_prefs.h" 50 #include "chrome/browser/prefs/browser_prefs.h"
51 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" 51 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
52 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 52 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
53 #include "chrome/browser/ui/app_list/arc/arc_app_test.h" 53 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
54 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" 54 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
55 #include "chrome/browser/ui/app_list/arc/arc_default_app_list.h" 55 #include "chrome/browser/ui/app_list/arc/arc_default_app_list.h"
56 #include "chrome/browser/ui/apps/chrome_app_delegate.h" 56 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
57 #include "chrome/browser/ui/ash/app_launcher_id.h"
57 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 58 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
58 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" 59 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
59 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h" 60 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
60 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" 61 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
61 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" 62 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
62 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h" 63 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h"
63 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 64 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
64 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h" 65 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
65 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 66 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
66 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 67 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
(...skipping 4069 matching lines...) Expand 10 before | Expand all | Expand 10 after
4136 4137
4137 // Pinned state should not change. 4138 // Pinned state should not change.
4138 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); 4139 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus());
4139 launcher_controller_->UnpinAppWithID(extension2_->id()); 4140 launcher_controller_->UnpinAppWithID(extension2_->id());
4140 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); 4141 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus());
4141 4142
4142 // Resume syncing and sync information overrides local copy. 4143 // Resume syncing and sync information overrides local copy.
4143 StartAppSyncService(copy_sync_list); 4144 StartAppSyncService(copy_sync_list);
4144 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); 4145 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus());
4145 } 4146 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698