Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Side by Side Diff: chrome/browser/ui/browser_navigator.cc

Issue 808253006: Remove the GoogleURLTracker infobar functionality entirely. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/navigation_correction_tab_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/browser_navigator.h" 5 #include "chrome/browser/ui/browser_navigator.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/ui/browser_instant_controller.h" 23 #include "chrome/browser/ui/browser_instant_controller.h"
24 #include "chrome/browser/ui/browser_window.h" 24 #include "chrome/browser/ui/browser_window.h"
25 #include "chrome/browser/ui/host_desktop.h" 25 #include "chrome/browser/ui/host_desktop.h"
26 #include "chrome/browser/ui/location_bar/location_bar.h" 26 #include "chrome/browser/ui/location_bar/location_bar.h"
27 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 27 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
28 #include "chrome/browser/ui/singleton_tabs.h" 28 #include "chrome/browser/ui/singleton_tabs.h"
29 #include "chrome/browser/ui/status_bubble.h" 29 #include "chrome/browser/ui/status_bubble.h"
30 #include "chrome/browser/ui/tab_helpers.h" 30 #include "chrome/browser/ui/tab_helpers.h"
31 #include "chrome/browser/ui/tabs/tab_strip_model.h" 31 #include "chrome/browser/ui/tabs/tab_strip_model.h"
32 #include "chrome/common/url_constants.h" 32 #include "chrome/common/url_constants.h"
33 #include "components/google/core/browser/google_url_tracker.h"
34 #include "content/public/browser/browser_url_handler.h" 33 #include "content/public/browser/browser_url_handler.h"
35 #include "content/public/browser/navigation_entry.h" 34 #include "content/public/browser/navigation_entry.h"
36 #include "content/public/browser/notification_service.h" 35 #include "content/public/browser/notification_service.h"
37 #include "content/public/browser/render_view_host.h" 36 #include "content/public/browser/render_view_host.h"
38 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
39 38
40 #if defined(USE_ASH) 39 #if defined(USE_ASH)
41 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 40 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
42 #endif 41 #endif
43 42
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 bool reverse_on_redirect = false; 770 bool reverse_on_redirect = false;
772 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( 771 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
773 &rewritten_url, browser_context, &reverse_on_redirect); 772 &rewritten_url, browser_context, &reverse_on_redirect);
774 773
775 // Some URLs are mapped to uber subpages. Do not allow them in incognito. 774 // Some URLs are mapped to uber subpages. Do not allow them in incognito.
776 return !(rewritten_url.scheme() == content::kChromeUIScheme && 775 return !(rewritten_url.scheme() == content::kChromeUIScheme &&
777 rewritten_url.host() == chrome::kChromeUIUberHost); 776 rewritten_url.host() == chrome::kChromeUIUberHost);
778 } 777 }
779 778
780 } // namespace chrome 779 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/navigation_correction_tab_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698