| 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/page_transition_types.h" | |
| 37 #include "chrome/common/page_zoom.h" | |
| 38 #include "content/browser/tab_contents/page_navigator.h" | 36 #include "content/browser/tab_contents/page_navigator.h" |
| 39 #include "content/browser/tab_contents/tab_contents_delegate.h" | 37 #include "content/browser/tab_contents/tab_contents_delegate.h" |
| 40 #include "content/common/notification_registrar.h" | 38 #include "content/common/notification_registrar.h" |
| 39 #include "content/common/page_transition_types.h" |
| 40 #include "content/common/page_zoom.h" |
| 41 #include "ui/gfx/rect.h" | 41 #include "ui/gfx/rect.h" |
| 42 | 42 |
| 43 class BrowserTabRestoreServiceDelegate; | 43 class BrowserTabRestoreServiceDelegate; |
| 44 class BrowserWindow; | 44 class BrowserWindow; |
| 45 class Extension; | 45 class Extension; |
| 46 class FindBarController; | 46 class FindBarController; |
| 47 class InstantController; | 47 class InstantController; |
| 48 class InstantUnloadHandler; | 48 class InstantUnloadHandler; |
| 49 class PrefService; | 49 class PrefService; |
| 50 class Profile; | 50 class Profile; |
| (...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1167 // Helper which implements the TabRestoreServiceDelegate interface. | 1167 // Helper which implements the TabRestoreServiceDelegate interface. |
| 1168 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 1168 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
| 1169 | 1169 |
| 1170 scoped_ptr<InstantController> instant_; | 1170 scoped_ptr<InstantController> instant_; |
| 1171 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1171 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1172 | 1172 |
| 1173 DISALLOW_COPY_AND_ASSIGN(Browser); | 1173 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1174 }; | 1174 }; |
| 1175 | 1175 |
| 1176 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1176 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |