| 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 16 matching lines...) Expand all Loading... |
| 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): remov
e | 28 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remov
e |
| 29 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remov
e | 29 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remov
e |
| 30 #include "chrome/browser/tab_contents/page_navigator.h" | 30 #include "chrome/browser/tab_contents/page_navigator.h" |
| 31 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 31 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
| 32 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 32 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 33 #include "chrome/common/extensions/extension_constants.h" | 33 #include "chrome/common/extensions/extension_constants.h" |
| 34 #include "chrome/common/notification_registrar.h" | 34 #include "chrome/common/notification_registrar.h" |
| 35 #include "chrome/common/page_transition_types.h" | 35 #include "chrome/common/page_transition_types.h" |
| 36 #include "chrome/common/page_zoom.h" | 36 #include "chrome/common/page_zoom.h" |
| 37 #include "gfx/rect.h" | 37 #include "ui/gfx/rect.h" |
| 38 | 38 |
| 39 class BrowserWindow; | 39 class BrowserWindow; |
| 40 class Extension; | 40 class Extension; |
| 41 class FindBarController; | 41 class FindBarController; |
| 42 class InstantController; | 42 class InstantController; |
| 43 class InstantUnloadHandler; | 43 class InstantUnloadHandler; |
| 44 class PrefService; | 44 class PrefService; |
| 45 class Profile; | 45 class Profile; |
| 46 class SessionStorageNamespace; | 46 class SessionStorageNamespace; |
| 47 class SkBitmap; | 47 class SkBitmap; |
| (...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1144 // and we install ourselves as an observer. | 1144 // and we install ourselves as an observer. |
| 1145 TabRestoreService* tab_restore_service_; | 1145 TabRestoreService* tab_restore_service_; |
| 1146 | 1146 |
| 1147 scoped_ptr<InstantController> instant_; | 1147 scoped_ptr<InstantController> instant_; |
| 1148 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1148 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1149 | 1149 |
| 1150 DISALLOW_COPY_AND_ASSIGN(Browser); | 1150 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1151 }; | 1151 }; |
| 1152 | 1152 |
| 1153 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1153 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |