| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 void OpenBookmarkManager(); | 362 void OpenBookmarkManager(); |
| 363 void ShowHistoryTab(); | 363 void ShowHistoryTab(); |
| 364 void ShowDownloadsTab(); | 364 void ShowDownloadsTab(); |
| 365 void OpenClearBrowsingDataDialog(); | 365 void OpenClearBrowsingDataDialog(); |
| 366 void OpenOptionsDialog(); | 366 void OpenOptionsDialog(); |
| 367 void OpenKeywordEditor(); | 367 void OpenKeywordEditor(); |
| 368 void OpenPasswordManager(); | 368 void OpenPasswordManager(); |
| 369 void OpenImportSettingsDialog(); | 369 void OpenImportSettingsDialog(); |
| 370 void OpenAboutChromeDialog(); | 370 void OpenAboutChromeDialog(); |
| 371 void OpenHelpTab(); | 371 void OpenHelpTab(); |
| 372 #if defined(LINUX2) |
| 373 void ShowControlPanel(); |
| 374 #endif |
| 372 | 375 |
| 373 virtual void UpdateDownloadShelfVisibility(bool visible); | 376 virtual void UpdateDownloadShelfVisibility(bool visible); |
| 374 | 377 |
| 375 ///////////////////////////////////////////////////////////////////////////// | 378 ///////////////////////////////////////////////////////////////////////////// |
| 376 | 379 |
| 377 static void RegisterPrefs(PrefService* prefs); | 380 static void RegisterPrefs(PrefService* prefs); |
| 378 static void RegisterUserPrefs(PrefService* prefs); | 381 static void RegisterUserPrefs(PrefService* prefs); |
| 379 | 382 |
| 380 // Returns the Browser which contains the tab with the given | 383 // Returns the Browser which contains the tab with the given |
| 381 // NavigationController, also filling in |index| (if valid) with the tab's | 384 // NavigationController, also filling in |index| (if valid) with the tab's |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 // The browser idle task helps cleanup unused memory resources when idle. | 750 // The browser idle task helps cleanup unused memory resources when idle. |
| 748 scoped_ptr<BrowserIdleTimer> idle_task_; | 751 scoped_ptr<BrowserIdleTimer> idle_task_; |
| 749 | 752 |
| 750 // Keep track of the encoding auto detect pref. | 753 // Keep track of the encoding auto detect pref. |
| 751 BooleanPrefMember encoding_auto_detect_; | 754 BooleanPrefMember encoding_auto_detect_; |
| 752 | 755 |
| 753 DISALLOW_COPY_AND_ASSIGN(Browser); | 756 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 754 }; | 757 }; |
| 755 | 758 |
| 756 #endif // CHROME_BROWSER_BROWSER_H_ | 759 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |