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

Unified Diff: chrome/browser/ui/views/profiles/new_avatar_button.cc

Issue 1605243002: Remove Metro mode avatar/profile switcher assets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unused header Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/profiles/new_avatar_button.cc
diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.cc b/chrome/browser/ui/views/profiles/new_avatar_button.cc
index 8e637bdd440d1c4b5a9c646c420448cf2dd627f3..e2cd5530e3456174630f7ee767eef89badd27206 100644
--- a/chrome/browser/ui/views/profiles/new_avatar_button.cc
+++ b/chrome/browser/ui/views/profiles/new_avatar_button.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/win/windows_version.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -80,17 +79,6 @@ NewAvatarButton::NewAvatarButton(views::ButtonListener* listener,
SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
generic_avatar_ =
*rb->GetImageNamed(IDR_AVATAR_THEMED_BUTTON_AVATAR).ToImageSkia();
-#if defined(OS_WIN)
- } else if (base::win::GetVersion() >= base::win::VERSION_WIN8 ||
tapted 2016/01/25 21:23:25 Argh. This is an `||` not an `&&`. What a trap. I
- browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
- const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_NORMAL);
- const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_HOVER);
- const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_METRO_BUTTON_PRESSED);
-
- SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
- generic_avatar_ =
- *rb->GetImageNamed(IDR_AVATAR_METRO_BUTTON_AVATAR).ToImageSkia();
-#endif
} else {
const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_NORMAL);
const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_HOVER);
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698