| 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 <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 #if defined(OS_CHROMEOS) | 401 #if defined(OS_CHROMEOS) |
| 402 void ShowControlPanel(); | 402 void ShowControlPanel(); |
| 403 #endif | 403 #endif |
| 404 | 404 |
| 405 virtual void UpdateDownloadShelfVisibility(bool visible); | 405 virtual void UpdateDownloadShelfVisibility(bool visible); |
| 406 | 406 |
| 407 ///////////////////////////////////////////////////////////////////////////// | 407 ///////////////////////////////////////////////////////////////////////////// |
| 408 | 408 |
| 409 // Sets the value of homepage related prefs to new values. Since we do not | 409 // Sets the value of homepage related prefs to new values. Since we do not |
| 410 // want to change these values for existing users, we can not change the | 410 // want to change these values for existing users, we can not change the |
| 411 // default values under RegisterUserPrefs. This method gets called during | 411 // default values under RegisterUserPrefs. Also if user already has an |
| 412 // First Run. | 412 // existing profile we do not want to override those preferences so we only |
| 413 // set new values if they have not been set already. This method gets called |
| 414 // during First Run. |
| 413 static void SetNewHomePagePrefs(PrefService* prefs); | 415 static void SetNewHomePagePrefs(PrefService* prefs); |
| 414 | 416 |
| 415 static void RegisterPrefs(PrefService* prefs); | 417 static void RegisterPrefs(PrefService* prefs); |
| 416 static void RegisterUserPrefs(PrefService* prefs); | 418 static void RegisterUserPrefs(PrefService* prefs); |
| 417 | 419 |
| 418 // Returns the Browser which contains the tab with the given | 420 // Returns the Browser which contains the tab with the given |
| 419 // NavigationController, also filling in |index| (if valid) with the tab's | 421 // NavigationController, also filling in |index| (if valid) with the tab's |
| 420 // index in the tab strip. | 422 // index in the tab strip. |
| 421 // Returns NULL if not found. | 423 // Returns NULL if not found. |
| 422 // This call is O(N) in the number of tabs. | 424 // This call is O(N) in the number of tabs. |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 796 // The browser idle task helps cleanup unused memory resources when idle. | 798 // The browser idle task helps cleanup unused memory resources when idle. |
| 797 scoped_ptr<BrowserIdleTimer> idle_task_; | 799 scoped_ptr<BrowserIdleTimer> idle_task_; |
| 798 | 800 |
| 799 // Keep track of the encoding auto detect pref. | 801 // Keep track of the encoding auto detect pref. |
| 800 BooleanPrefMember encoding_auto_detect_; | 802 BooleanPrefMember encoding_auto_detect_; |
| 801 | 803 |
| 802 DISALLOW_COPY_AND_ASSIGN(Browser); | 804 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 803 }; | 805 }; |
| 804 | 806 |
| 805 #endif // CHROME_BROWSER_BROWSER_H_ | 807 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |