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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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 #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"
12 #include "ash/common/shelf/shelf_model_observer.h"
13 #include "ash/display/window_tree_host_manager.h" 11 #include "ash/display/window_tree_host_manager.h"
14 #include "ash/public/cpp/shelf_types.h" 12 #include "ash/public/cpp/shelf_types.h"
13 #include "ash/shelf/shelf_delegate.h"
14 #include "ash/shelf/shelf_model_observer.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 "base/memory/weak_ptr.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" 19 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
20 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" 20 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
21 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 21 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
23 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h" 23 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h"
24 #include "components/prefs/pref_change_registrar.h" 24 #include "components/prefs/pref_change_registrar.h"
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 typedef std::vector<std::string> RunningAppListIds; 315 typedef std::vector<std::string> RunningAppListIds;
316 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; 316 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
317 RunningAppListIdMap last_used_running_application_order_; 317 RunningAppListIdMap last_used_running_application_order_;
318 318
319 base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_; 319 base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_;
320 320
321 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); 321 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);
322 }; 322 };
323 323
324 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ 324 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698