| OLD | NEW |
| 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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 // TODO(simon.hong81): Make this take a scoped_ptr of |item_delegate|. | 544 // TODO(simon.hong81): Make this take a scoped_ptr of |item_delegate|. |
| 545 void SetShelfItemDelegate(ash::ShelfID id, | 545 void SetShelfItemDelegate(ash::ShelfID id, |
| 546 ash::ShelfItemDelegate* item_delegate); | 546 ash::ShelfItemDelegate* item_delegate); |
| 547 | 547 |
| 548 // Attach to a specific profile. | 548 // Attach to a specific profile. |
| 549 void AttachProfile(Profile* proifile); | 549 void AttachProfile(Profile* proifile); |
| 550 | 550 |
| 551 // Forget the current profile to allow attaching to a new one. | 551 // Forget the current profile to allow attaching to a new one. |
| 552 void ReleaseProfile(); | 552 void ReleaseProfile(); |
| 553 | 553 |
| 554 // Returns true if |app_id| is a Packaged App that has already launched on the | |
| 555 // native desktop and, if so, executes it as a desktop shortcut to activate | |
| 556 // desktop mode and send another OnLaunched event to the Extension. | |
| 557 bool LaunchedInNativeDesktop(const std::string& app_id); | |
| 558 | |
| 559 static ChromeLauncherController* instance_; | 554 static ChromeLauncherController* instance_; |
| 560 | 555 |
| 561 ash::ShelfModel* model_; | 556 ash::ShelfModel* model_; |
| 562 | 557 |
| 563 ash::ShelfItemDelegateManager* item_delegate_manager_; | 558 ash::ShelfItemDelegateManager* item_delegate_manager_; |
| 564 | 559 |
| 565 // Profile used for prefs and loading extensions. This is NOT necessarily the | 560 // Profile used for prefs and loading extensions. This is NOT necessarily the |
| 566 // profile new windows are created with. | 561 // profile new windows are created with. |
| 567 Profile* profile_; | 562 Profile* profile_; |
| 568 | 563 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 // The list of running & un-pinned applications for different users on hidden | 599 // The list of running & un-pinned applications for different users on hidden |
| 605 // desktops. | 600 // desktops. |
| 606 typedef std::vector<std::string> RunningAppListIds; | 601 typedef std::vector<std::string> RunningAppListIds; |
| 607 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; | 602 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; |
| 608 RunningAppListIdMap last_used_running_application_order_; | 603 RunningAppListIdMap last_used_running_application_order_; |
| 609 | 604 |
| 610 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); | 605 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); |
| 611 }; | 606 }; |
| 612 | 607 |
| 613 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ | 608 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ |
| OLD | NEW |