| OLD | NEW | 
|    1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2012 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 <string> |   10 #include <string> | 
|   11  |   11  | 
|   12 #include "ash/launcher/launcher_delegate.h" |   12 #include "ash/launcher/launcher_delegate.h" | 
|   13 #include "ash/launcher/launcher_model_observer.h" |   13 #include "ash/launcher/launcher_model_observer.h" | 
|   14 #include "ash/launcher/launcher_types.h" |   14 #include "ash/launcher/launcher_types.h" | 
|   15 #include "ash/shell_observer.h" |   15 #include "ash/shell_observer.h" | 
|   16 #include "ash/wm/shelf_types.h" |   16 #include "ash/wm/shelf_types.h" | 
|   17 #include "base/basictypes.h" |   17 #include "base/basictypes.h" | 
|   18 #include "base/compiler_specific.h" |   18 #include "base/compiler_specific.h" | 
|   19 #include "base/memory/scoped_ptr.h" |   19 #include "base/memory/scoped_ptr.h" | 
|   20 #include "base/timer.h" |   20 #include "base/timer.h" | 
 |   21 #include "chrome/browser/api/prefs/pref_change_registrar.h" | 
|   21 #include "chrome/browser/extensions/extension_prefs.h" |   22 #include "chrome/browser/extensions/extension_prefs.h" | 
|   22 #include "chrome/browser/extensions/shell_window_registry.h" |   23 #include "chrome/browser/extensions/shell_window_registry.h" | 
|   23 #include "chrome/browser/prefs/pref_change_registrar.h" |  | 
|   24 #include "chrome/browser/sync/profile_sync_service_observer.h" |   24 #include "chrome/browser/sync/profile_sync_service_observer.h" | 
|   25 #include "content/public/browser/notification_observer.h" |   25 #include "content/public/browser/notification_observer.h" | 
|   26 #include "content/public/browser/notification_registrar.h" |   26 #include "content/public/browser/notification_registrar.h" | 
|   27 #include "ui/aura/client/activation_change_observer.h" |   27 #include "ui/aura/client/activation_change_observer.h" | 
|   28 #include "ui/aura/window_observer.h" |   28 #include "ui/aura/window_observer.h" | 
|   29  |   29  | 
|   30 namespace ash { |   30 namespace ash { | 
|   31 class LauncherModel; |   31 class LauncherModel; | 
|   32 } |   32 } | 
|   33  |   33  | 
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  365   PrefChangeRegistrar pref_change_registrar_; |  365   PrefChangeRegistrar pref_change_registrar_; | 
|  366   aura::client::ActivationClient* activation_client_; |  366   aura::client::ActivationClient* activation_client_; | 
|  367  |  367  | 
|  368   ProfileSyncService* observed_sync_service_; |  368   ProfileSyncService* observed_sync_service_; | 
|  369   base::OneShotTimer<ChromeLauncherController> loading_timer_; |  369   base::OneShotTimer<ChromeLauncherController> loading_timer_; | 
|  370  |  370  | 
|  371   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); |  371   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); | 
|  372 }; |  372 }; | 
|  373  |  373  | 
|  374 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ |  374 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ | 
| OLD | NEW |