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

Side by Side Diff: chrome/browser/android/logo_service.cc

Issue 808253006: Remove the GoogleURLTracker infobar functionality entirely. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix size_t -> int conversion (since I turned off the warning disable for it) Created 6 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/android/logo_service.h" 5 #include "chrome/browser/android/logo_service.h"
6 6
7 #include "base/memory/weak_ptr.h" 7 #include "base/memory/weak_ptr.h"
8 #include "chrome/browser/google/google_profile_helper.h" 8 #include "chrome/browser/google/google_profile_helper.h"
9 #include "chrome/browser/image_decoder.h" 9 #include "chrome/browser/image_decoder.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/search_engines/template_url_service_factory.h" 11 #include "chrome/browser/search_engines/template_url_service_factory.h"
12 #include "components/google/core/browser/google_url_tracker.h"
13 #include "components/google/core/browser/google_util.h" 12 #include "components/google/core/browser/google_util.h"
14 #include "components/keyed_service/content/browser_context_dependency_manager.h" 13 #include "components/keyed_service/content/browser_context_dependency_manager.h"
15 #include "components/search_engines/template_url_service.h" 14 #include "components/search_engines/template_url_service.h"
16 #include "components/search_provider_logos/google_logo_api.h" 15 #include "components/search_provider_logos/google_logo_api.h"
17 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
18 #include "net/url_request/url_request_context_getter.h" 17 #include "net/url_request/url_request_context_getter.h"
19 18
20 using content::BrowserThread; 19 using content::BrowserThread;
21 using search_provider_logos::Logo; 20 using search_provider_logos::Logo;
22 using search_provider_logos::LogoDelegate; 21 using search_provider_logos::LogoDelegate;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 } 167 }
169 168
170 LogoServiceFactory::~LogoServiceFactory() {} 169 LogoServiceFactory::~LogoServiceFactory() {}
171 170
172 KeyedService* LogoServiceFactory::BuildServiceInstanceFor( 171 KeyedService* LogoServiceFactory::BuildServiceInstanceFor(
173 content::BrowserContext* context) const { 172 content::BrowserContext* context) const {
174 Profile* profile = static_cast<Profile*>(context); 173 Profile* profile = static_cast<Profile*>(context);
175 DCHECK(!profile->IsOffTheRecord()); 174 DCHECK(!profile->IsOffTheRecord());
176 return new LogoService(profile); 175 return new LogoService(profile);
177 } 176 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698