OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/sync/profile_sync_service_observer.h" | 26 #include "chrome/browser/sync/profile_sync_service_observer.h" |
27 #include "chrome/browser/tabs/tab_handler.h" | 27 #include "chrome/browser/tabs/tab_handler.h" |
28 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove | 28 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove |
29 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove | 29 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove |
30 #include "chrome/browser/ui/browser_navigator.h" | 30 #include "chrome/browser/ui/browser_navigator.h" |
31 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 31 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
32 #include "chrome/browser/ui/shell_dialogs.h" | 32 #include "chrome/browser/ui/shell_dialogs.h" |
33 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" | 33 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" |
34 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 34 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
35 #include "chrome/common/extensions/extension_constants.h" | 35 #include "chrome/common/extensions/extension_constants.h" |
36 #include "chrome/common/notification_registrar.h" | |
37 #include "chrome/common/page_transition_types.h" | 36 #include "chrome/common/page_transition_types.h" |
38 #include "chrome/common/page_zoom.h" | 37 #include "chrome/common/page_zoom.h" |
39 #include "content/browser/tab_contents/page_navigator.h" | 38 #include "content/browser/tab_contents/page_navigator.h" |
40 #include "content/browser/tab_contents/tab_contents_delegate.h" | 39 #include "content/browser/tab_contents/tab_contents_delegate.h" |
| 40 #include "content/common/notification_registrar.h" |
41 #include "ui/gfx/rect.h" | 41 #include "ui/gfx/rect.h" |
42 | 42 |
43 class BrowserWindow; | 43 class BrowserWindow; |
44 class Extension; | 44 class Extension; |
45 class FindBarController; | 45 class FindBarController; |
46 class InstantController; | 46 class InstantController; |
47 class InstantUnloadHandler; | 47 class InstantUnloadHandler; |
48 class PrefService; | 48 class PrefService; |
49 class Profile; | 49 class Profile; |
50 class SessionStorageNamespace; | 50 class SessionStorageNamespace; |
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1150 // and we install ourselves as an observer. | 1150 // and we install ourselves as an observer. |
1151 TabRestoreService* tab_restore_service_; | 1151 TabRestoreService* tab_restore_service_; |
1152 | 1152 |
1153 scoped_ptr<InstantController> instant_; | 1153 scoped_ptr<InstantController> instant_; |
1154 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1154 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1155 | 1155 |
1156 DISALLOW_COPY_AND_ASSIGN(Browser); | 1156 DISALLOW_COPY_AND_ASSIGN(Browser); |
1157 }; | 1157 }; |
1158 | 1158 |
1159 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1159 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |