| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 // Used by the "Get themes" link in the options dialog. | 540 // Used by the "Get themes" link in the options dialog. |
| 541 void OpenThemeGalleryTabAndActivate(); | 541 void OpenThemeGalleryTabAndActivate(); |
| 542 void OpenAutoFillHelpTabAndActivate(); | 542 void OpenAutoFillHelpTabAndActivate(); |
| 543 void OpenPrivacyDashboardTabAndActivate(); | 543 void OpenPrivacyDashboardTabAndActivate(); |
| 544 void OpenSearchEngineOptionsDialog(); | 544 void OpenSearchEngineOptionsDialog(); |
| 545 #if defined(OS_CHROMEOS) | 545 #if defined(OS_CHROMEOS) |
| 546 void OpenInternetOptionsDialog(); | 546 void OpenInternetOptionsDialog(); |
| 547 void OpenLanguageOptionsDialog(); | 547 void OpenLanguageOptionsDialog(); |
| 548 void OpenSystemOptionsDialog(); | 548 void OpenSystemOptionsDialog(); |
| 549 #endif | 549 #endif |
| 550 void OpenCloudPrintProxySetupDialog(); |
| 550 | 551 |
| 551 virtual void UpdateDownloadShelfVisibility(bool visible); | 552 virtual void UpdateDownloadShelfVisibility(bool visible); |
| 552 | 553 |
| 553 // Overridden from TabStripModelDelegate: | 554 // Overridden from TabStripModelDelegate: |
| 554 virtual bool UseVerticalTabs() const; | 555 virtual bool UseVerticalTabs() const; |
| 555 | 556 |
| 556 ///////////////////////////////////////////////////////////////////////////// | 557 ///////////////////////////////////////////////////////////////////////////// |
| 557 | 558 |
| 558 // Sets the value of homepage related prefs to new values. Since we do not | 559 // Sets the value of homepage related prefs to new values. Since we do not |
| 559 // want to change these values for existing users, we can not change the | 560 // want to change these values for existing users, we can not change the |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1084 // The profile's tab restore service. The service is owned by the profile, | 1085 // The profile's tab restore service. The service is owned by the profile, |
| 1085 // and we install ourselves as an observer. | 1086 // and we install ourselves as an observer. |
| 1086 TabRestoreService* tab_restore_service_; | 1087 TabRestoreService* tab_restore_service_; |
| 1087 | 1088 |
| 1088 scoped_ptr<MatchPreview> match_preview_; | 1089 scoped_ptr<MatchPreview> match_preview_; |
| 1089 | 1090 |
| 1090 DISALLOW_COPY_AND_ASSIGN(Browser); | 1091 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1091 }; | 1092 }; |
| 1092 | 1093 |
| 1093 #endif // CHROME_BROWSER_BROWSER_H_ | 1094 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |