| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/google/google_url_tracker_infobar_delegate.h" | 5 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h" |
| 6 | 6 |
| 7 #include "chrome/browser/google/google_url_tracker.h" | 7 #include "chrome/browser/google/google_url_tracker.h" |
| 8 #include "chrome/browser/google/google_util.h" | 8 #include "chrome/browser/google/google_util.h" |
| 9 #include "chrome/browser/infobars/infobar.h" | |
| 10 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.h" |
| 10 #include "components/infobars/core/infobar.h" |
| 11 #include "content/public/browser/navigation_entry.h" | 11 #include "content/public/browser/navigation_entry.h" |
| 12 #include "content/public/browser/page_navigator.h" | 12 #include "content/public/browser/page_navigator.h" |
| 13 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
| 14 #include "grit/generated_resources.h" | 14 #include "grit/generated_resources.h" |
| 15 #include "net/base/net_util.h" | 15 #include "net/base/net_util.h" |
| 16 #include "ui/base/l10n/l10n_util.h" | 16 #include "ui/base/l10n/l10n_util.h" |
| 17 | 17 |
| 18 | 18 |
| 19 // static | 19 // static |
| 20 InfoBar* GoogleURLTrackerInfoBarDelegate::Create( | 20 infobars::InfoBar* GoogleURLTrackerInfoBarDelegate::Create( |
| 21 InfoBarService* infobar_service, | 21 InfoBarService* infobar_service, |
| 22 GoogleURLTracker* google_url_tracker, | 22 GoogleURLTracker* google_url_tracker, |
| 23 const GURL& search_url) { | 23 const GURL& search_url) { |
| 24 return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( | 24 return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( |
| 25 scoped_ptr<ConfirmInfoBarDelegate>(new GoogleURLTrackerInfoBarDelegate( | 25 scoped_ptr<ConfirmInfoBarDelegate>(new GoogleURLTrackerInfoBarDelegate( |
| 26 google_url_tracker, search_url)))); | 26 google_url_tracker, search_url)))); |
| 27 } | 27 } |
| 28 | 28 |
| 29 bool GoogleURLTrackerInfoBarDelegate::Accept() { | 29 bool GoogleURLTrackerInfoBarDelegate::Accept() { |
| 30 google_url_tracker_->AcceptGoogleURL(true); | 30 google_url_tracker_->AcceptGoogleURL(true); |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, | 116 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, |
| 117 content::PAGE_TRANSITION_LINK, false)); | 117 content::PAGE_TRANSITION_LINK, false)); |
| 118 return false; | 118 return false; |
| 119 } | 119 } |
| 120 | 120 |
| 121 bool GoogleURLTrackerInfoBarDelegate::ShouldExpireInternal( | 121 bool GoogleURLTrackerInfoBarDelegate::ShouldExpireInternal( |
| 122 const NavigationDetails& details) const { | 122 const NavigationDetails& details) const { |
| 123 return (details.entry_id != contents_unique_id()) && | 123 return (details.entry_id != contents_unique_id()) && |
| 124 (details.entry_id != pending_id_); | 124 (details.entry_id != pending_id_); |
| 125 } | 125 } |
| OLD | NEW |