| 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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 void OpenBookmarkManager(); | 369 void OpenBookmarkManager(); |
| 370 #endif | 370 #endif |
| 371 void ShowHistoryTab(); | 371 void ShowHistoryTab(); |
| 372 void ShowDownloadsTab(); | 372 void ShowDownloadsTab(); |
| 373 void OpenClearBrowsingDataDialog(); | 373 void OpenClearBrowsingDataDialog(); |
| 374 void OpenOptionsDialog(); | 374 void OpenOptionsDialog(); |
| 375 #if defined(OS_WIN) | 375 #if defined(OS_WIN) |
| 376 void OpenKeywordEditor(); | 376 void OpenKeywordEditor(); |
| 377 void OpenPasswordManager(); | 377 void OpenPasswordManager(); |
| 378 #endif | 378 #endif |
| 379 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 380 void OpenImportSettingsDialog(); | 379 void OpenImportSettingsDialog(); |
| 381 #endif | |
| 382 void OpenAboutChromeDialog(); | 380 void OpenAboutChromeDialog(); |
| 383 void OpenHelpTab(); | 381 void OpenHelpTab(); |
| 384 | 382 |
| 385 ///////////////////////////////////////////////////////////////////////////// | 383 ///////////////////////////////////////////////////////////////////////////// |
| 386 | 384 |
| 387 static void RegisterPrefs(PrefService* prefs); | 385 static void RegisterPrefs(PrefService* prefs); |
| 388 static void RegisterUserPrefs(PrefService* prefs); | 386 static void RegisterUserPrefs(PrefService* prefs); |
| 389 | 387 |
| 390 // Returns the Browser which contains the tab with the given | 388 // Returns the Browser which contains the tab with the given |
| 391 // NavigationController, also filling in |index| (if valid) with the tab's | 389 // NavigationController, also filling in |index| (if valid) with the tab's |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 762 // The browser idle task helps cleanup unused memory resources when idle. | 760 // The browser idle task helps cleanup unused memory resources when idle. |
| 763 scoped_ptr<BrowserIdleTimer> idle_task_; | 761 scoped_ptr<BrowserIdleTimer> idle_task_; |
| 764 | 762 |
| 765 // Keep track of the encoding auto detect pref. | 763 // Keep track of the encoding auto detect pref. |
| 766 BooleanPrefMember encoding_auto_detect_; | 764 BooleanPrefMember encoding_auto_detect_; |
| 767 | 765 |
| 768 DISALLOW_COPY_AND_ASSIGN(Browser); | 766 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 769 }; | 767 }; |
| 770 | 768 |
| 771 #endif // CHROME_BROWSER_BROWSER_H_ | 769 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |