| 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.h" | 5 #include "chrome/browser/google/google_url_tracker.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| 11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
| 12 #include "chrome/browser/google/google_url_tracker_factory.h" | 12 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 13 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h" | 13 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h" |
| 14 #include "chrome/browser/google/google_url_tracker_navigation_helper.h" | 14 #include "chrome/browser/google/google_url_tracker_navigation_helper.h" |
| 15 #include "chrome/browser/google/google_util.h" | 15 #include "chrome/browser/google/google_util.h" |
| 16 #include "chrome/browser/infobars/infobar.h" | |
| 17 #include "chrome/browser/infobars/infobar_service.h" | 16 #include "chrome/browser/infobars/infobar_service.h" |
| 18 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 19 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
| 20 #include "components/infobars/core/infobar.h" |
| 21 #include "content/public/browser/navigation_controller.h" | 21 #include "content/public/browser/navigation_controller.h" |
| 22 #include "content/public/browser/navigation_entry.h" | 22 #include "content/public/browser/navigation_entry.h" |
| 23 #include "content/public/browser/notification_service.h" | 23 #include "content/public/browser/notification_service.h" |
| 24 #include "net/base/load_flags.h" | 24 #include "net/base/load_flags.h" |
| 25 #include "net/base/net_util.h" | 25 #include "net/base/net_util.h" |
| 26 #include "net/url_request/url_fetcher.h" | 26 #include "net/url_request/url_fetcher.h" |
| 27 #include "net/url_request/url_request_status.h" | 27 #include "net/url_request/url_request_status.h" |
| 28 | 28 |
| 29 | 29 |
| 30 const char GoogleURLTracker::kDefaultGoogleHomepage[] = | 30 const char GoogleURLTracker::kDefaultGoogleHomepage[] = |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 const GURL& search_url) { | 337 const GURL& search_url) { |
| 338 EntryMap::iterator i(entry_map_.find(infobar_service)); | 338 EntryMap::iterator i(entry_map_.find(infobar_service)); |
| 339 DCHECK(i != entry_map_.end()); | 339 DCHECK(i != entry_map_.end()); |
| 340 GoogleURLTrackerMapEntry* map_entry = i->second; | 340 GoogleURLTrackerMapEntry* map_entry = i->second; |
| 341 DCHECK(search_url.is_valid()); | 341 DCHECK(search_url.is_valid()); |
| 342 | 342 |
| 343 UnregisterForEntrySpecificNotifications(*map_entry, true); | 343 UnregisterForEntrySpecificNotifications(*map_entry, true); |
| 344 if (map_entry->has_infobar_delegate()) { | 344 if (map_entry->has_infobar_delegate()) { |
| 345 map_entry->infobar_delegate()->Update(search_url); | 345 map_entry->infobar_delegate()->Update(search_url); |
| 346 } else { | 346 } else { |
| 347 InfoBar* infobar = infobar_creator_.Run(infobar_service, this, search_url); | 347 infobars::InfoBar* infobar = |
| 348 infobar_creator_.Run(infobar_service, this, search_url); |
| 348 if (infobar) { | 349 if (infobar) { |
| 349 map_entry->SetInfoBarDelegate( | 350 map_entry->SetInfoBarDelegate( |
| 350 static_cast<GoogleURLTrackerInfoBarDelegate*>(infobar->delegate())); | 351 static_cast<GoogleURLTrackerInfoBarDelegate*>(infobar->delegate())); |
| 351 } else { | 352 } else { |
| 352 map_entry->Close(false); | 353 map_entry->Close(false); |
| 353 } | 354 } |
| 354 } | 355 } |
| 355 } | 356 } |
| 356 | 357 |
| 357 void GoogleURLTracker::OnTabClosed( | 358 void GoogleURLTracker::OnTabClosed( |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 i->second->navigation_controller())) { | 414 i->second->navigation_controller())) { |
| 414 DCHECK(nav_helper_->IsListeningForNavigationStart()); | 415 DCHECK(nav_helper_->IsListeningForNavigationStart()); |
| 415 return; | 416 return; |
| 416 } | 417 } |
| 417 } | 418 } |
| 418 if (nav_helper_->IsListeningForNavigationStart()) { | 419 if (nav_helper_->IsListeningForNavigationStart()) { |
| 419 DCHECK(!search_committed_); | 420 DCHECK(!search_committed_); |
| 420 nav_helper_->SetListeningForNavigationStart(false); | 421 nav_helper_->SetListeningForNavigationStart(false); |
| 421 } | 422 } |
| 422 } | 423 } |
| OLD | NEW |