Revert 113634 - Add support for high contrast mode to bubbles

BUG=105023
TEST=


Review URL: http://codereview.chromium.org/8887003

TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/8872029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113637 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/views/avatar_menu_bubble_view.cc

@@ -288,11 +288,6 @@ void ProfileItemView::OnBlur() {
 void ProfileItemView::OnHighlightStateChanged() {
   set_background(IsHighlighted() ? views::Background::CreateSolidBackground(
       SkColorSetRGB(0xe3, 0xed, 0xf6)) : NULL);
-  SkColor background_color = background() ?
-      background()->get_color() : views::BubbleDelegateView::kBackgroundColor;
-  name_label_->SetBackgroundColor(background_color);
-  sync_state_label_->SetBackgroundColor(background_color);
-  edit_link_->SetBackgroundColor(background_color);
 
   bool show_edit = IsHighlighted() && item_.active;
   sync_state_label_->SetVisible(!show_edit);
@@ -493,7 +488,6 @@ void AvatarMenuBubbleView::OnAvatarMenuModelChanged(
       l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_LINK));
   add_profile_link_->set_listener(this);
   add_profile_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  add_profile_link_->SetBackgroundColor(color());
   add_profile_link_->SetEnabledColor(SkColorSetRGB(0xe3, 0xed, 0xf6));
   AddChildView(add_profile_link_);
 

ui/views/bubble/bubble_delegate.cc

@@ -5,7 +5,6 @@
 #include "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
-#include "ui/gfx/color_utils.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
@@ -72,13 +71,8 @@ Widget* CreateBorderWidget(BubbleDelegateView* bubble, Widget* parent) {
 
 }  // namespace
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-const SkColor BubbleDelegateView::kBackgroundColor =
-    color_utils::GetSysSkColor(COLOR_WINDOW);
-#else
-// TODO(beng): source from theme provider.
-const SkColor Bubble::kBackgroundColor = SK_ColorWHITE;
-#endif
+// TODO(msw): Use NativeTheme/color_helper (crbug.com/105023).
+const SkColor BubbleDelegateView::kBackgroundColor = SK_ColorWHITE;
 
 BubbleDelegateView::BubbleDelegateView()
     : close_on_esc_(true),