| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" | 5 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" |
| 6 | 6 |
| 7 #include "chrome/browser/signin/signin_promo.h" | 7 #include "chrome/browser/signin/signin_promo.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
| 10 #include "chrome/browser/ui/browser_list.h" | 10 #include "chrome/browser/ui/browser_list.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 } | 30 } |
| 31 | 31 |
| 32 void BookmarkBubbleSignInDelegate::OnBrowserRemoved(Browser* browser) { | 32 void BookmarkBubbleSignInDelegate::OnBrowserRemoved(Browser* browser) { |
| 33 if (browser == browser_) | 33 if (browser == browser_) |
| 34 browser_ = NULL; | 34 browser_ = NULL; |
| 35 } | 35 } |
| 36 | 36 |
| 37 void BookmarkBubbleSignInDelegate::EnsureBrowser() { | 37 void BookmarkBubbleSignInDelegate::EnsureBrowser() { |
| 38 if (!browser_) { | 38 if (!browser_) { |
| 39 Profile* original_profile = profile_->GetOriginalProfile(); | 39 Profile* original_profile = profile_->GetOriginalProfile(); |
| 40 browser_ = chrome::FindLastActiveWithProfile(original_profile, | 40 browser_ = chrome::FindLastActiveWithProfile(original_profile); |
| 41 desktop_type_); | |
| 42 if (!browser_) { | 41 if (!browser_) { |
| 43 browser_ = new Browser(Browser::CreateParams(original_profile, | 42 browser_ = new Browser(Browser::CreateParams(original_profile, |
| 44 desktop_type_)); | 43 desktop_type_)); |
| 45 } | 44 } |
| 46 } | 45 } |
| 47 } | 46 } |
| OLD | NEW |