diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:58:17 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:58:17 +0000 |
| commit | 2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c (patch) | |
| tree | 617cf49b21490c8e7b2e3c5a821c5d72c5735894 /chrome/browser/browser.h | |
| parent | 492399e06e64635ca8e3191f0653a8b081863b33 (diff) | |
| download | chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.zip chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.tar.gz chromium_src-2baf83d75ea5d1233d3ddcf8e28aa4f4466c115c.tar.bz2 | |
Fix 1295677: REGRESSION: Import SETS startup page to imported home page.
We had only kHomePage pref before, which if blank/set to chrome-internal: meant that the New Tab page should be shown when Home is pressed. Now we add a pref called kHomePageIsNewTabPage for this purpose, which allows us to set the kHomePage value during import without actually using it as the HomePage (effectively importing home page becomes importing a default suggestion for when the users want a home page instead of the New Tab page).
BUG=1295677
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 9c22d7f..fc84974 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -27,8 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef CHROME_BROWSER_BROWSER_H__ -#define CHROME_BROWSER_BROWSER_H__ +#ifndef CHROME_BROWSER_BROWSER_H_ +#define CHROME_BROWSER_BROWSER_H_ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_type.h" @@ -404,6 +404,10 @@ class Browser : public TabStripModelDelegate, // Returns the root view for this browser. ChromeViews::RootView* GetRootView() const; + // Returns what the user's home page is, or the new tab page if the home page + // has not been set. + GURL GetHomePage(); + // Called when this window gains or loses window-manager-level activation. // is_active is whether or not the Window is now active. void WindowActivationChanged(bool is_active); @@ -634,4 +638,4 @@ class Browser : public TabStripModelDelegate, DISALLOW_EVIL_CONSTRUCTORS(Browser); }; -#endif // CHROME_BROWSER_BROWSER_H__ +#endif // CHROME_BROWSER_BROWSER_H_ |