| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 | 564 |
| 565 // Closes the frame. | 565 // Closes the frame. |
| 566 // TODO(beng): figure out if we need this now that the frame itself closes | 566 // TODO(beng): figure out if we need this now that the frame itself closes |
| 567 // after a return to the message loop. | 567 // after a return to the message loop. |
| 568 void CloseFrame(); | 568 void CloseFrame(); |
| 569 | 569 |
| 570 // Compute a deterministic name based on the URL. We use this pseudo name | 570 // Compute a deterministic name based on the URL. We use this pseudo name |
| 571 // as a key to store window location per application URLs. | 571 // as a key to store window location per application URLs. |
| 572 static std::wstring ComputeApplicationNameFromURL(const GURL& url); | 572 static std::wstring ComputeApplicationNameFromURL(const GURL& url); |
| 573 | 573 |
| 574 FRIEND_TEST(BrowserTest, NoTabsInPopups); |
| 575 |
| 574 // Create a preference dictionary for the provided application name. This is | 576 // Create a preference dictionary for the provided application name. This is |
| 575 // done only once per application name / per session. | 577 // done only once per application name / per session. |
| 576 static void RegisterAppPrefs(const std::wstring& app_name); | 578 static void RegisterAppPrefs(const std::wstring& app_name); |
| 577 | 579 |
| 578 // Data members ///////////////////////////////////////////////////////////// | 580 // Data members ///////////////////////////////////////////////////////////// |
| 579 | 581 |
| 580 // This Browser's type. | 582 // This Browser's type. |
| 581 Type type_; | 583 Type type_; |
| 582 | 584 |
| 583 // This Browser's profile. | 585 // This Browser's profile. |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 // The browser idle task helps cleanup unused memory resources when idle. | 678 // The browser idle task helps cleanup unused memory resources when idle. |
| 677 scoped_ptr<BrowserIdleTimer> idle_task_; | 679 scoped_ptr<BrowserIdleTimer> idle_task_; |
| 678 | 680 |
| 679 // Keep track of the encoding auto detect pref. | 681 // Keep track of the encoding auto detect pref. |
| 680 BooleanPrefMember encoding_auto_detect_; | 682 BooleanPrefMember encoding_auto_detect_; |
| 681 | 683 |
| 682 DISALLOW_COPY_AND_ASSIGN(Browser); | 684 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 683 }; | 685 }; |
| 684 | 686 |
| 685 #endif // CHROME_BROWSER_BROWSER_H_ | 687 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |