| 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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_BROWSER_H_ |
| 6 #define CHROME_BROWSER_BROWSER_H_ | 6 #define CHROME_BROWSER_BROWSER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" |
| 14 #include "base/scoped_ptr.h" | 14 #include "base/scoped_ptr.h" |
| 15 #include "base/task.h" | |
| 16 #include "chrome/browser/command_updater.h" | 15 #include "chrome/browser/command_updater.h" |
| 17 #include "chrome/browser/pref_member.h" | 16 #include "chrome/browser/pref_member.h" |
| 18 #include "chrome/browser/sessions/session_id.h" | 17 #include "chrome/browser/sessions/session_id.h" |
| 19 #include "chrome/browser/sessions/tab_restore_service.h" | 18 #include "chrome/browser/sessions/tab_restore_service.h" |
| 20 #include "chrome/browser/shell_dialogs.h" | 19 #include "chrome/browser/shell_dialogs.h" |
| 21 #include "chrome/browser/tabs/tab_strip_model.h" | 20 #include "chrome/browser/tabs/tab_strip_model.h" |
| 22 #include "chrome/browser/tab_contents/page_navigator.h" | 21 #include "chrome/browser/tab_contents/page_navigator.h" |
| 23 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 22 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
| 24 #include "chrome/browser/toolbar_model.h" | 23 #include "chrome/browser/toolbar_model.h" |
| 25 #include "chrome/common/extensions/extension.h" | 24 #include "chrome/common/extensions/extension.h" |
| (...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1045 mutable BooleanPrefMember use_vertical_tabs_; | 1044 mutable BooleanPrefMember use_vertical_tabs_; |
| 1046 | 1045 |
| 1047 // The profile's tab restore service. The service is owned by the profile, | 1046 // The profile's tab restore service. The service is owned by the profile, |
| 1048 // and we install ourselves as an observer. | 1047 // and we install ourselves as an observer. |
| 1049 TabRestoreService* tab_restore_service_; | 1048 TabRestoreService* tab_restore_service_; |
| 1050 | 1049 |
| 1051 DISALLOW_COPY_AND_ASSIGN(Browser); | 1050 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1052 }; | 1051 }; |
| 1053 | 1052 |
| 1054 #endif // CHROME_BROWSER_BROWSER_H_ | 1053 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |