| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 22 matching lines...) Expand all Loading... |
| 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 "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 PrefService; | 44 class PrefService; |
| 44 class Profile; | 45 class Profile; |
| 45 class SessionStorageNamespace; | 46 class SessionStorageNamespace; |
| 46 class SkBitmap; | 47 class SkBitmap; |
| 47 class StatusBubble; | 48 class StatusBubble; |
| 48 class TabNavigation; | 49 class TabNavigation; |
| 49 class TabStripModel; | 50 class TabStripModel; |
| 50 struct WebApplicationInfo; | 51 struct WebApplicationInfo; |
| 51 namespace gfx { | 52 namespace gfx { |
| 52 class Point; | 53 class Point; |
| (...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 const Extension* extension_app_; | 1114 const Extension* extension_app_; |
| 1114 | 1115 |
| 1115 // Tracks the display mode of the tabstrip. | 1116 // Tracks the display mode of the tabstrip. |
| 1116 mutable BooleanPrefMember use_vertical_tabs_; | 1117 mutable BooleanPrefMember use_vertical_tabs_; |
| 1117 | 1118 |
| 1118 // The profile's tab restore service. The service is owned by the profile, | 1119 // The profile's tab restore service. The service is owned by the profile, |
| 1119 // and we install ourselves as an observer. | 1120 // and we install ourselves as an observer. |
| 1120 TabRestoreService* tab_restore_service_; | 1121 TabRestoreService* tab_restore_service_; |
| 1121 | 1122 |
| 1122 scoped_ptr<InstantController> instant_; | 1123 scoped_ptr<InstantController> instant_; |
| 1124 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1123 | 1125 |
| 1124 DISALLOW_COPY_AND_ASSIGN(Browser); | 1126 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1125 }; | 1127 }; |
| 1126 | 1128 |
| 1127 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1129 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |