summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/first_run_bubble.h
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 21:17:21 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 21:17:21 +0000
commit96f6cdf87ac7e80d522988fee993632a3df4005a (patch)
treefa653cba5fa8f3a3c370514ce2c4e7c4064dc804 /chrome/browser/views/first_run_bubble.h
parent46e90c9970090aeffbb30f73495c866d30551cd5 (diff)
downloadchromium_src-96f6cdf87ac7e80d522988fee993632a3df4005a.zip
chromium_src-96f6cdf87ac7e80d522988fee993632a3df4005a.tar.gz
chromium_src-96f6cdf87ac7e80d522988fee993632a3df4005a.tar.bz2
Bug 4688: First run bubble ignores user's keyboard attempt
(tab) to change Search Engine. Not a good first impression. BUG=4688 TEST=Open Chrome using --first-run, press Cancel on the import dialog and watch the First Run bubble come up. Use Tab and then Enter and the Change Search Engine should appear. Then try it again, but this time click outside the bubble to dismiss it (corner case that could lead to a crash). Review URL: http://codereview.chromium.org/48138 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/first_run_bubble.h')
-rw-r--r--chrome/browser/views/first_run_bubble.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/chrome/browser/views/first_run_bubble.h b/chrome/browser/views/first_run_bubble.h
index a358aa8..d921987 100644
--- a/chrome/browser/views/first_run_bubble.h
+++ b/chrome/browser/views/first_run_bubble.h
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H__
-#define CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H__
+#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_
+#define CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_
#include "base/task.h"
#include "chrome/browser/views/info_bubble.h"
+class FirstRunBubbleView;
class Profile;
class FirstRunBubble : public InfoBubble,
@@ -18,7 +19,8 @@ class FirstRunBubble : public InfoBubble,
FirstRunBubble()
: enable_window_method_factory_(this),
- has_been_activated_(false) {
+ has_been_activated_(false),
+ view_(NULL) {
}
virtual ~FirstRunBubble() {
@@ -27,6 +29,8 @@ class FirstRunBubble : public InfoBubble,
enable_window_method_factory_.RevokeAll();
}
+ void set_view(FirstRunBubbleView* view) { view_ = view; }
+
// Overridden from InfoBubble:
virtual void OnActivate(UINT action, BOOL minimized, HWND window);
@@ -44,7 +48,10 @@ class FirstRunBubble : public InfoBubble,
ScopedRunnableMethodFactory<FirstRunBubble> enable_window_method_factory_;
- DISALLOW_EVIL_CONSTRUCTORS(FirstRunBubble);
+ // The view inside the FirstRunBubble.
+ FirstRunBubbleView* view_;
+
+ DISALLOW_COPY_AND_ASSIGN(FirstRunBubble);
};
-#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H__
+#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_