diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 02:58:36 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 02:58:36 +0000 |
| commit | 6ea265a8b1b6e1512992945efa08942f575ad4c1 (patch) | |
| tree | 5b58bd5a7f6f599db9e08435965fb81ca54c4930 /chrome/browser/browser_list.cc | |
| parent | 5ffd5e9b703d122dbac2dce9425a88b414f6de97 (diff) | |
| download | chromium_src-6ea265a8b1b6e1512992945efa08942f575ad4c1.zip chromium_src-6ea265a8b1b6e1512992945efa08942f575ad4c1.tar.gz chromium_src-6ea265a8b1b6e1512992945efa08942f575ad4c1.tar.bz2 | |
Changes session restore to account for apps and popups. If you have
session restore enabled any time you transition from no tabbed
browsers to a tabbed browser (in the same profile) we restore your
last session, where the last session was any previously open tabbed
browsers. For example, if you start Chrome from an installed app
shortcut then create a new tabbed browser (by any means) we'll restore
your last session. This gives the illustion that apps are running in
their own process.
I would love to have test coverage of this, but I'm loathe to write
anymore flakey UI tests. Need to revisit post 1.0.
BUG=1883
TEST=thoroughly test session restore, especially with application
shortcuts and popups.
Review URL: http://codereview.chromium.org/8856
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_list.cc')
| -rw-r--r-- | chrome/browser/browser_list.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_list.cc b/chrome/browser/browser_list.cc index f3cc18f..cd1e488 100644 --- a/chrome/browser/browser_list.cc +++ b/chrome/browser/browser_list.cc @@ -178,7 +178,7 @@ Browser* BrowserList::GetLastActive() { // static Browser* BrowserList::FindBrowserWithType(Profile* p, BrowserType::Type t) { Browser* last_active = GetLastActive(); - if (last_active->profile() == p && last_active->GetType() == t) + if (last_active && last_active->profile() == p && last_active->GetType() == t) return last_active; BrowserList::const_iterator i; |