Commit for Miranda.

http://codereview.chromium.org/115265

Original text:
"""
This addresses 3 of the 4 issues described in Issue 9223: 

1) Creates a new streamlined bubble with less text.
2) Incorporates a close [x].
3) Driven by configuration option in master_preferences file; this alternate
   bubble will be used only if "oem_bubble": true is set.

Requested longer linger time feature will involve mucking with the focus 
manager; this change will be uploaded separately.

BUG=9223
TEST=Add "oem_bubble": true to master_preferences file.  Run chrome with
--first-run option.  Alternate, smaller OEM bubble should appear over the Chrome
browser in the place of the standard first-run bubble.
"""


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

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/views/first_run_bubble.h b/chrome/browser/views/first_run_bubble.h
index d921987..598362b 100644
--- a/chrome/browser/views/first_run_bubble.h
+++ b/chrome/browser/views/first_run_bubble.h
@@ -8,14 +8,15 @@
 #include "base/task.h"
 #include "chrome/browser/views/info_bubble.h"
 
-class FirstRunBubbleView;
+class FirstRunBubbleViewBase;
 class Profile;
 
 class FirstRunBubble : public InfoBubble,
                        public InfoBubbleDelegate {
  public:
   static FirstRunBubble* Show(Profile* profile, HWND parent_hwnd,
-                              const gfx::Rect& position_relative_to);
+                              const gfx::Rect& position_relative_to,
+                              bool use_OEM_bubble);
 
   FirstRunBubble()
       : enable_window_method_factory_(this),
@@ -29,7 +30,7 @@ class FirstRunBubble : public InfoBubble,
     enable_window_method_factory_.RevokeAll();
   }
 
-  void set_view(FirstRunBubbleView* view) { view_ = view; }
+  void set_view(FirstRunBubbleViewBase* view) { view_ = view; }
 
   // Overridden from InfoBubble:
   virtual void OnActivate(UINT action, BOOL minimized, HWND window);
@@ -49,7 +50,7 @@ class FirstRunBubble : public InfoBubble,
   ScopedRunnableMethodFactory<FirstRunBubble> enable_window_method_factory_;
 
   // The view inside the FirstRunBubble.
-  FirstRunBubbleView* view_;
+  FirstRunBubbleViewBase* view_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunBubble);
 };