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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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 <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/browser_process.h" 30 #include "chrome/browser/browser_process.h"
31 #include "chrome/browser/chrome_notification_types.h" 31 #include "chrome/browser/chrome_notification_types.h"
32 #include "chrome/browser/defaults.h" 32 #include "chrome/browser/defaults.h"
33 #include "chrome/browser/extensions/extension_util.h" 33 #include "chrome/browser/extensions/extension_util.h"
34 #include "chrome/browser/prefs/incognito_mode_prefs.h" 34 #include "chrome/browser/prefs/incognito_mode_prefs.h"
35 #include "chrome/browser/prefs/pref_service_syncable_util.h" 35 #include "chrome/browser/prefs/pref_service_syncable_util.h"
36 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
37 #include "chrome/browser/profiles/profile_manager.h" 37 #include "chrome/browser/profiles/profile_manager.h"
38 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" 38 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
39 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" 39 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
40 #include "chrome/browser/ui/ash/app_launcher_id.h"
40 #include "chrome/browser/ui/ash/app_sync_ui_state.h" 41 #include "chrome/browser/ui/ash/app_sync_ui_state.h"
41 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 42 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
42 #include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h " 43 #include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h "
43 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" 44 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
44 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h" 45 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
45 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h" 46 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
46 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" 47 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
47 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h" 48 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"
48 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" 49 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
49 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" 50 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after
1490 LauncherItemController* controller = GetLauncherItemController(item.id); 1491 LauncherItemController* controller = GetLauncherItemController(item.id);
1491 if (!controller || controller->image_set_by_controller()) 1492 if (!controller || controller->image_set_by_controller())
1492 continue; 1493 continue;
1493 item.image = image; 1494 item.image = image;
1494 if (arc_deferred_launcher_) 1495 if (arc_deferred_launcher_)
1495 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image); 1496 arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image);
1496 model_->Set(index, item); 1497 model_->Set(index, item);
1497 // It's possible we're waiting on more than one item, so don't break. 1498 // It's possible we're waiting on more than one item, so don't break.
1498 } 1499 }
1499 } 1500 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698