Implement fading in for the InfoBubble base class.

For bubbles that are not shown as a direct result of
a mouse click, we use fade in. This applies to
the FirstRun bubble and the extension installed
bubble.

For bubbles that have controls (buttons/links) we
fade out if interacting with those controls closes
the bubble. This applies to the first run bubble,
app launcher, extension installed bubble, bookmark
bubble and the content settings bubble.

BUG=None
TEST=Make sure the above-mentioned bubbles fade in
and out during hide and show as described above.

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

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

1 files changed, 3 insertions, 0 deletions

diff --git a/chrome/browser/views/content_blocked_bubble_contents.cc b/chrome/browser/views/content_blocked_bubble_contents.cc
index 71d4d7e..1f43ec1 100644
--- a/chrome/browser/views/content_blocked_bubble_contents.cc
+++ b/chrome/browser/views/content_blocked_bubble_contents.cc
@@ -120,6 +120,7 @@ void ContentSettingBubbleContents::ViewHierarchyChanged(bool is_add,
 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
                                                  const views::Event& event) {
   if (sender == close_button_) {
+    info_bubble_->set_fade_away_on_close(true);
     info_bubble_->Close();  // CAREFUL: This deletes us.
     return;
   }
@@ -137,6 +138,7 @@ void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
 void ContentSettingBubbleContents::LinkActivated(views::Link* source,
                                                  int event_flags) {
   if (source == manage_link_) {
+    info_bubble_->set_fade_away_on_close(true);
     content_setting_bubble_model_->OnManageLinkClicked();
     // CAREFUL: Showing the settings window activates it, which deactivates the
     // info bubble, which causes it to close, which deletes us.
@@ -144,6 +146,7 @@ void ContentSettingBubbleContents::LinkActivated(views::Link* source,
   }
   if (source == clear_link_) {
     content_setting_bubble_model_->OnClearLinkClicked();
+    info_bubble_->set_fade_away_on_close(true);
     info_bubble_->Close();  // CAREFUL: This deletes us.
     return;
   }