chromeos: Minor changes to volume/brightness bubble UI.

chrome/browser/ui/views/bubble/bubble.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bubble/bubble.h"
 
 #include <vector>
 
 #include "chrome/browser/ui/views/bubble/border_contents.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 88 matching lines @@
   } else {
 #if defined(OS_WIN)
     // When fading in we need to remove the layered window style flag, since
     // that style prevents some bubble content from working properly.
     SetWindowLong(GWL_EXSTYLE, GetWindowLong(GWL_EXSTYLE) & ~WS_EX_LAYERED);
 #endif
   }
 }
 
 void Bubble::AnimationProgressed(const ui::Animation* animation) {
-#if defined(OS_WIN)
   // Set the opacity for the main contents window.
   unsigned char opacity = static_cast<unsigned char>(
       animation_->GetCurrentValue() * 255);
+#if defined(OS_WIN)
   SetLayeredWindowAttributes(GetNativeView(), 0,
       static_cast<byte>(opacity), LWA_ALPHA);
   contents_->SchedulePaint();
 
   // Also fade in/out the bubble border window.
   border_->SetOpacity(opacity);
   border_->border_contents()->SchedulePaint();
 #else
-  NOTIMPLEMENTED();
+  SetOpacity(opacity);
+  border_contents_->SchedulePaint();
 #endif
 }
 
 Bubble::Bubble()
     :
 #if defined(OS_WIN)
       views::NativeWidgetWin(new views::Widget),
 #elif defined(TOOLKIT_USES_GTK)
       views::NativeWidgetGtk(new views::Widget),
 #endif
@@ skipping 36 matching lines @@
 
 void Bubble::InitBubble(views::Widget* parent,
                         const gfx::Rect& position_relative_to,
                         BubbleBorder::ArrowLocation arrow_location,
                         views::View* contents,
                         BubbleDelegate* delegate) {
   delegate_ = delegate;
   position_relative_to_ = position_relative_to;
   arrow_location_ = arrow_location;
   contents_ = contents;
+  const bool fade_in = delegate_ && delegate_->FadeInOnShow();
 
   // Create the main window.
 #if defined(OS_WIN)
   views::Widget* parent_window = parent->GetTopLevelWidget();
   if (parent_window)
     parent_window->DisableInactiveRendering();
   set_window_style(WS_POPUP | WS_CLIPCHILDREN);
   int extended_style = WS_EX_TOOLWINDOW;
   // During FadeIn we need to turn on the layered window style to deal with
   // transparency. This flag needs to be reset after fading in is complete.
-  bool fade_in = delegate_ && delegate_->FadeInOnShow();
   if (fade_in)
     extended_style |= WS_EX_LAYERED;
   set_window_ex_style(extended_style);
 
   DCHECK(!border_);
   border_ = new BorderWidgetWin();
 
   border_->InitBorderWidgetWin(CreateBorderContents(), parent->GetNativeView());
   border_->border_contents()->SetBackgroundColor(kBackgroundColor);
 
   // We make the BorderWidgetWin the owner of the Bubble HWND, so that the
   // latter is displayed on top of the former.
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.parent = border_->GetNativeView();
   params.native_widget = this;
   GetWidget()->Init(params);
 
   if (fade_in) {
     border_->SetOpacity(0);
     GetWidget()->SetOpacity(0);
   }
   SetWindowText(GetNativeView(), delegate_->accessible_name().c_str());
 #elif defined(TOOLKIT_USES_GTK)
   views::Widget::InitParams params(type_);
   params.transparent = true;
   params.parent_widget = parent;
   params.native_widget = this;
   GetWidget()->Init(params);
+  if (fade_in)
+    SetOpacity(0);
 #if defined(OS_CHROMEOS)
   {
     vector<int> params;
     params.push_back(show_while_screen_is_locked_ ? 1 : 0);
     chromeos::WmIpc::instance()->SetWindowType(
         GetNativeView(),
         chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
         &params);
   }
 #endif
@@ skipping 48 matching lines @@
 
   // Done creating the bubble.
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_INFO_BUBBLE_CREATED, Source<Bubble>(this),
       NotificationService::NoDetails());
 
   // Show the window.
 #if defined(OS_WIN)
   border_->ShowWindow(SW_SHOW);
   ShowWindow(SW_SHOW);
-  if (fade_in)
-    FadeIn();
 #elif defined(TOOLKIT_USES_GTK)
   GetWidget()->Show();
 #endif
+
+  if (fade_in)
+    FadeIn();
 }
 
 void Bubble::RegisterEscapeAccelerator() {
   GetWidget()->GetFocusManager()->RegisterAccelerator(
       views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
   accelerator_registered_ = true;
 }
 
 void Bubble::UnregisterEscapeAccelerator() {
   DCHECK(accelerator_registered_);
@@ skipping 94 matching lines @@
     animation_->Hide();
 }
 
 bool Bubble::AcceleratorPressed(const views::Accelerator& accelerator) {
   if (!delegate_ || delegate_->CloseOnEscape()) {
     DoClose(true);
     return true;
   }
   return false;
 }