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

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

Issue 12789006: base/prefs: Remove the public/ directory and move the files to //base/prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
OLDNEW
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_PER_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_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/shelf/shelf_types.h" 15 #include "ash/shelf/shelf_types.h"
16 #include "ash/shell_observer.h" 16 #include "ash/shell_observer.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/prefs/public/pref_change_registrar.h" 20 #include "base/prefs/pref_change_registrar.h"
21 #include "chrome/browser/extensions/extension_prefs.h" 21 #include "chrome/browser/extensions/extension_prefs.h"
22 #include "chrome/browser/prefs/pref_service_syncable_observer.h" 22 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
23 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" 23 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 24 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
25 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" 25 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
26 #include "content/public/browser/notification_observer.h" 26 #include "content/public/browser/notification_observer.h"
27 #include "content/public/browser/notification_registrar.h" 27 #include "content/public/browser/notification_registrar.h"
28 #include "ui/aura/window_observer.h" 28 #include "ui/aura/window_observer.h"
29 29
30 class AppSyncUIState; 30 class AppSyncUIState;
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 PrefChangeRegistrar pref_change_registrar_; 374 PrefChangeRegistrar pref_change_registrar_;
375 375
376 AppSyncUIState* app_sync_ui_state_; 376 AppSyncUIState* app_sync_ui_state_;
377 377
378 scoped_ptr<ExtensionEnableFlow> extension_enable_flow_; 378 scoped_ptr<ExtensionEnableFlow> extension_enable_flow_;
379 379
380 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser); 380 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser);
381 }; 381 };
382 382
383 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_ 383 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698