summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/app_launcher.h
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/app_launcher.h
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/app_launcher.h')
-rw-r--r--chrome/browser/views/app_launcher.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/chrome/browser/views/app_launcher.h b/chrome/browser/views/app_launcher.h
index 954a154..3a03f9e 100644
--- a/chrome/browser/views/app_launcher.h
+++ b/chrome/browser/views/app_launcher.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_VIEWS_APP_LAUNCHER_H_
#define CHROME_BROWSER_VIEWS_APP_LAUNCHER_H_
+#include <string>
+
#include "app/slide_animation.h"
#include "base/scoped_ptr.h"
#include "base/task.h"
@@ -44,8 +46,8 @@ class AppLauncher : public AnimationDelegate,
const std::string& hash_params);
// Shows an application launcher bubble pointing to the new tab button.
- // Any |hash_params| are appened to the hash of the URL that is opened in the
- // launcher.
+ // Any |hash_params| are appended to the hash of the URL that is opened in
+ // the launcher.
//
// The caller DOES NOT OWN the AppLauncher returned. It is deleted
// automatically when the AppLauncher is closed.
@@ -68,15 +70,7 @@ class AppLauncher : public AnimationDelegate,
virtual void InfoBubbleClosing(InfoBubble* info_bubble,
bool closed_by_escape);
virtual bool CloseOnEscape() { return true; }
- virtual bool FadeOutOnClose() {
- // If this is changed we also need to update
- // AppLauncherHandler::AnimateAppIcon.
-#if defined(OS_WIN)
- return true;
-#else
- return false;
-#endif
- }
+ virtual bool FadeInOnShow() { return false; }
// TabContentsDelegate.
virtual void OpenURLFromTab(TabContents* source,