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

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

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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/android/logo_service.h ('k') | chrome/browser/android/meta_tag_observer.h » ('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 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"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 (const ImageDecoder*) NULL), 62 (const ImageDecoder*) NULL),
63 base::TimeDelta::FromSeconds(kDecodeLogoTimeoutSeconds)); 63 base::TimeDelta::FromSeconds(kDecodeLogoTimeoutSeconds));
64 } 64 }
65 65
66 virtual ~LogoDecoderDelegate() { 66 virtual ~LogoDecoderDelegate() {
67 image_decoder_->set_delegate(NULL); 67 image_decoder_->set_delegate(NULL);
68 } 68 }
69 69
70 // ImageDecoder::Delegate: 70 // ImageDecoder::Delegate:
71 virtual void OnImageDecoded(const ImageDecoder* decoder, 71 virtual void OnImageDecoded(const ImageDecoder* decoder,
72 const SkBitmap& decoded_image) OVERRIDE { 72 const SkBitmap& decoded_image) override {
73 image_decoded_callback_.Run(decoded_image); 73 image_decoded_callback_.Run(decoded_image);
74 delete this; 74 delete this;
75 } 75 }
76 76
77 virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE { 77 virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override {
78 image_decoded_callback_.Run(SkBitmap()); 78 image_decoded_callback_.Run(SkBitmap());
79 delete this; 79 delete this;
80 } 80 }
81 81
82 private: 82 private:
83 scoped_refptr<ImageDecoder> image_decoder_; 83 scoped_refptr<ImageDecoder> image_decoder_;
84 base::Callback<void(const SkBitmap&)> image_decoded_callback_; 84 base::Callback<void(const SkBitmap&)> image_decoded_callback_;
85 base::WeakPtrFactory<LogoDecoderDelegate> weak_ptr_factory_; 85 base::WeakPtrFactory<LogoDecoderDelegate> weak_ptr_factory_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(LogoDecoderDelegate); 87 DISALLOW_COPY_AND_ASSIGN(LogoDecoderDelegate);
88 }; 88 };
89 89
90 class ChromeLogoDelegate : public search_provider_logos::LogoDelegate { 90 class ChromeLogoDelegate : public search_provider_logos::LogoDelegate {
91 public: 91 public:
92 ChromeLogoDelegate() {} 92 ChromeLogoDelegate() {}
93 virtual ~ChromeLogoDelegate() {} 93 virtual ~ChromeLogoDelegate() {}
94 94
95 // search_provider_logos::LogoDelegate: 95 // search_provider_logos::LogoDelegate:
96 virtual void DecodeUntrustedImage( 96 virtual void DecodeUntrustedImage(
97 const scoped_refptr<base::RefCountedString>& encoded_image, 97 const scoped_refptr<base::RefCountedString>& encoded_image,
98 base::Callback<void(const SkBitmap&)> image_decoded_callback) OVERRIDE { 98 base::Callback<void(const SkBitmap&)> image_decoded_callback) override {
99 scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder( 99 scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder(
100 NULL, 100 NULL,
101 encoded_image->data(), 101 encoded_image->data(),
102 ImageDecoder::DEFAULT_CODEC); 102 ImageDecoder::DEFAULT_CODEC);
103 LogoDecoderDelegate* delegate = 103 LogoDecoderDelegate* delegate =
104 new LogoDecoderDelegate(image_decoder, image_decoded_callback); 104 new LogoDecoderDelegate(image_decoder, image_decoded_callback);
105 image_decoder->set_delegate(delegate); 105 image_decoder->set_delegate(delegate);
106 image_decoder->Start(base::MessageLoopProxy::current()); 106 image_decoder->Start(base::MessageLoopProxy::current());
107 } 107 }
108 108
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 } 168 }
169 169
170 LogoServiceFactory::~LogoServiceFactory() {} 170 LogoServiceFactory::~LogoServiceFactory() {}
171 171
172 KeyedService* LogoServiceFactory::BuildServiceInstanceFor( 172 KeyedService* LogoServiceFactory::BuildServiceInstanceFor(
173 content::BrowserContext* context) const { 173 content::BrowserContext* context) const {
174 Profile* profile = static_cast<Profile*>(context); 174 Profile* profile = static_cast<Profile*>(context);
175 DCHECK(!profile->IsOffTheRecord()); 175 DCHECK(!profile->IsOffTheRecord());
176 return new LogoService(profile); 176 return new LogoService(profile);
177 } 177 }
OLDNEW
« no previous file with comments | « chrome/browser/android/logo_service.h ('k') | chrome/browser/android/meta_tag_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698