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

Side by Side Diff: chrome/browser/profiles/profile_avatar_icon_util.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
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/profiles/profile_avatar_icon_util.h" 5 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/format_macros.h" 8 #include "base/format_macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 }; 53 };
54 54
55 AvatarImageSource(gfx::ImageSkia avatar, 55 AvatarImageSource(gfx::ImageSkia avatar,
56 const gfx::Size& canvas_size, 56 const gfx::Size& canvas_size,
57 int width, 57 int width,
58 AvatarPosition position, 58 AvatarPosition position,
59 AvatarBorder border); 59 AvatarBorder border);
60 virtual ~AvatarImageSource(); 60 virtual ~AvatarImageSource();
61 61
62 // CanvasImageSource override: 62 // CanvasImageSource override:
63 virtual void Draw(gfx::Canvas* canvas) OVERRIDE; 63 virtual void Draw(gfx::Canvas* canvas) override;
64 64
65 private: 65 private:
66 gfx::ImageSkia avatar_; 66 gfx::ImageSkia avatar_;
67 const gfx::Size canvas_size_; 67 const gfx::Size canvas_size_;
68 const int width_; 68 const int width_;
69 const int height_; 69 const int height_;
70 const AvatarPosition position_; 70 const AvatarPosition position_;
71 const AvatarBorder border_; 71 const AvatarBorder border_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(AvatarImageSource); 73 DISALLOW_COPY_AND_ASSIGN(AvatarImageSource);
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 int_value >= static_cast<int>(kDefaultAvatarIconsCount)) 379 int_value >= static_cast<int>(kDefaultAvatarIconsCount))
380 return false; 380 return false;
381 *icon_index = int_value; 381 *icon_index = int_value;
382 return true; 382 return true;
383 } 383 }
384 384
385 return false; 385 return false;
386 } 386 }
387 387
388 } // namespace profiles 388 } // namespace profiles
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_avatar_downloader.h ('k') | chrome/browser/profiles/profile_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698