| 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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 void OpenClearBrowsingDataDialog(); | 381 void OpenClearBrowsingDataDialog(); |
| 382 void OpenOptionsDialog(); | 382 void OpenOptionsDialog(); |
| 383 void OpenKeywordEditor(); | 383 void OpenKeywordEditor(); |
| 384 void OpenPasswordManager(); | 384 void OpenPasswordManager(); |
| 385 void OpenImportSettingsDialog(); | 385 void OpenImportSettingsDialog(); |
| 386 void OpenAboutChromeDialog(); | 386 void OpenAboutChromeDialog(); |
| 387 void OpenHelpTab(); | 387 void OpenHelpTab(); |
| 388 #if defined(OS_CHROMEOS) | 388 #if defined(OS_CHROMEOS) |
| 389 void ShowControlPanel(); | 389 void ShowControlPanel(); |
| 390 #endif | 390 #endif |
| 391 void OpenApiPermissionsPanel(); |
| 391 | 392 |
| 392 virtual void UpdateDownloadShelfVisibility(bool visible); | 393 virtual void UpdateDownloadShelfVisibility(bool visible); |
| 393 | 394 |
| 394 ///////////////////////////////////////////////////////////////////////////// | 395 ///////////////////////////////////////////////////////////////////////////// |
| 395 | 396 |
| 396 static void RegisterPrefs(PrefService* prefs); | 397 static void RegisterPrefs(PrefService* prefs); |
| 397 static void RegisterUserPrefs(PrefService* prefs); | 398 static void RegisterUserPrefs(PrefService* prefs); |
| 398 | 399 |
| 399 // Returns the Browser which contains the tab with the given | 400 // Returns the Browser which contains the tab with the given |
| 400 // NavigationController, also filling in |index| (if valid) with the tab's | 401 // NavigationController, also filling in |index| (if valid) with the tab's |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 // The browser idle task helps cleanup unused memory resources when idle. | 775 // The browser idle task helps cleanup unused memory resources when idle. |
| 775 scoped_ptr<BrowserIdleTimer> idle_task_; | 776 scoped_ptr<BrowserIdleTimer> idle_task_; |
| 776 | 777 |
| 777 // Keep track of the encoding auto detect pref. | 778 // Keep track of the encoding auto detect pref. |
| 778 BooleanPrefMember encoding_auto_detect_; | 779 BooleanPrefMember encoding_auto_detect_; |
| 779 | 780 |
| 780 DISALLOW_COPY_AND_ASSIGN(Browser); | 781 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 781 }; | 782 }; |
| 782 | 783 |
| 783 #endif // CHROME_BROWSER_BROWSER_H_ | 784 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |