| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #include "content/common/page_transition_types.h" | 44 #include "content/common/page_transition_types.h" |
| 45 #include "content/common/page_zoom.h" | 45 #include "content/common/page_zoom.h" |
| 46 #include "ui/gfx/rect.h" | 46 #include "ui/gfx/rect.h" |
| 47 | 47 |
| 48 class BrowserTabRestoreServiceDelegate; | 48 class BrowserTabRestoreServiceDelegate; |
| 49 class BrowserWindow; | 49 class BrowserWindow; |
| 50 class Extension; | 50 class Extension; |
| 51 class FindBarController; | 51 class FindBarController; |
| 52 class InstantController; | 52 class InstantController; |
| 53 class InstantUnloadHandler; | 53 class InstantUnloadHandler; |
| 54 class MHTMLGenerationManager; |
| 54 class PrefService; | 55 class PrefService; |
| 55 class Profile; | 56 class Profile; |
| 56 class SessionStorageNamespace; | 57 class SessionStorageNamespace; |
| 57 class SkBitmap; | 58 class SkBitmap; |
| 58 class StatusBubble; | 59 class StatusBubble; |
| 59 class TabNavigation; | 60 class TabNavigation; |
| 60 class TabStripModel; | 61 class TabStripModel; |
| 61 struct WebApplicationInfo; | 62 struct WebApplicationInfo; |
| 62 namespace gfx { | 63 namespace gfx { |
| 63 class Point; | 64 class Point; |
| (...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1233 // The profile's tab restore service. The service is owned by the profile, | 1234 // The profile's tab restore service. The service is owned by the profile, |
| 1234 // and we install ourselves as an observer. | 1235 // and we install ourselves as an observer. |
| 1235 TabRestoreService* tab_restore_service_; | 1236 TabRestoreService* tab_restore_service_; |
| 1236 | 1237 |
| 1237 // Helper which implements the TabRestoreServiceDelegate interface. | 1238 // Helper which implements the TabRestoreServiceDelegate interface. |
| 1238 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 1239 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
| 1239 | 1240 |
| 1240 scoped_ptr<InstantController> instant_; | 1241 scoped_ptr<InstantController> instant_; |
| 1241 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1242 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1242 | 1243 |
| 1244 scoped_refptr<MHTMLGenerationManager> mhtml_generation_manager_; |
| 1245 |
| 1243 DISALLOW_COPY_AND_ASSIGN(Browser); | 1246 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1244 }; | 1247 }; |
| 1245 | 1248 |
| 1246 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1249 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |