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_IMPL_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ |
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ |
7 | 7 |
8 #include <list> | 8 #include <list> |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
11 #include "ash/common/shelf/shelf_delegate.h" | 11 #include "ash/common/shelf/shelf_delegate.h" |
12 #include "ash/common/shelf/shelf_model_observer.h" | 12 #include "ash/common/shelf/shelf_model_observer.h" |
13 #include "ash/common/shelf/shelf_types.h" | 13 #include "ash/common/shelf/shelf_types.h" |
14 #include "ash/display/window_tree_host_manager.h" | 14 #include "ash/display/window_tree_host_manager.h" |
15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
16 #include "base/macros.h" | 16 #include "base/macros.h" |
17 #include "base/memory/weak_ptr.h" | |
17 #include "build/build_config.h" | 18 #include "build/build_config.h" |
18 #include "chrome/browser/ui/app_icon_loader.h" | 19 #include "chrome/browser/ui/app_icon_loader.h" |
19 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 20 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
20 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" | 21 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" |
21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
22 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h" | 23 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h" |
23 #include "components/prefs/pref_change_registrar.h" | 24 #include "components/prefs/pref_change_registrar.h" |
24 #include "ui/aura/window_observer.h" | 25 #include "ui/aura/window_observer.h" |
25 | 26 |
26 class AppSyncUIState; | 27 class AppSyncUIState; |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
350 | 351 |
351 // If true, incoming pinned state changes should be ignored. | 352 // If true, incoming pinned state changes should be ignored. |
352 bool ignore_persist_pinned_state_change_ = false; | 353 bool ignore_persist_pinned_state_change_ = false; |
353 | 354 |
354 // The list of running & un-pinned applications for different users on hidden | 355 // The list of running & un-pinned applications for different users on hidden |
355 // desktops. | 356 // desktops. |
356 typedef std::vector<std::string> RunningAppListIds; | 357 typedef std::vector<std::string> RunningAppListIds; |
357 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; | 358 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; |
358 RunningAppListIdMap last_used_running_application_order_; | 359 RunningAppListIdMap last_used_running_application_order_; |
359 | 360 |
361 base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_; | |
khmel
2016/08/25 22:06:08
To fix crashes in unit tests and possible crash in
| |
362 | |
360 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); | 363 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); |
361 }; | 364 }; |
362 | 365 |
363 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ | 366 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ |
OLD | NEW |