summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/first_run_bubble.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-18 21:54:49 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-18 21:54:49 +0000
commit98e94a40052f163889a5d6026a24d750edf28818 (patch)
treecc100e38a4f40b260080aad9b4713d764bd3e303 /chrome/browser/views/first_run_bubble.cc
parentea4dbc90144ad244f4520ac78d87040f0ee84221 (diff)
downloadchromium_src-98e94a40052f163889a5d6026a24d750edf28818.zip
chromium_src-98e94a40052f163889a5d6026a24d750edf28818.tar.gz
chromium_src-98e94a40052f163889a5d6026a24d750edf28818.tar.bz2
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
Diffstat (limited to 'chrome/browser/views/first_run_bubble.cc')
-rw-r--r--chrome/browser/views/first_run_bubble.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 7728888..141a12f 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -85,7 +85,7 @@ class FirstRunBubbleView : public FirstRunBubbleViewBase {
virtual ~FirstRunBubbleView() {}
// FirstRunBubbleViewBase:
- void BubbleShown();
+ virtual void BubbleShown();
// Overridden from View:
virtual void ButtonPressed(views::Button* sender, const views::Event& event);
@@ -160,6 +160,7 @@ void FirstRunBubbleView::ButtonPressed(views::Button* sender,
const views::Event& event) {
UserMetrics::RecordAction(UserMetricsAction("FirstRunBubbleView_Clicked"),
profile_);
+ bubble_window_->set_fade_away_on_close(true);
bubble_window_->Close();
if (change_button_ == sender) {
UserMetrics::RecordAction(
@@ -245,7 +246,7 @@ class FirstRunOEMBubbleView : public FirstRunBubbleViewBase {
virtual ~FirstRunOEMBubbleView() { }
// FirstRunBubbleViewBase:
- void BubbleShown();
+ virtual void BubbleShown();
// Overridden from View:
virtual void ButtonPressed(views::Button* sender, const views::Event& event);
@@ -316,6 +317,7 @@ void FirstRunOEMBubbleView::ButtonPressed(views::Button* sender,
const views::Event& event) {
UserMetrics::RecordAction(UserMetricsAction("FirstRunOEMBubbleView_Clicked"),
profile_);
+ bubble_window_->set_fade_away_on_close(true);
bubble_window_->Close();
}
@@ -386,10 +388,10 @@ class FirstRunMinimalBubbleView : public FirstRunBubbleViewBase {
explicit FirstRunMinimalBubbleView(FirstRunBubble* bubble_window);
private:
- virtual ~FirstRunMinimalBubbleView() { }
+ virtual ~FirstRunMinimalBubbleView() { }
// FirstRunBubbleViewBase:
- void BubbleShown();
+ virtual void BubbleShown();
// Overridden from View:
virtual void ButtonPressed(views::Button* sender,