summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 07:16:12 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 07:16:12 +0000
commitdd1605a8587bb74236f558307f560c9a36bcd8f6 (patch)
tree64c0d3f386a2dceccc0efce16848ecdeb796cce1
parent7a7a0cacab9a41394be57568930c92963278faa1 (diff)
downloadchromium_src-dd1605a8587bb74236f558307f560c9a36bcd8f6.zip
chromium_src-dd1605a8587bb74236f558307f560c9a36bcd8f6.tar.gz
chromium_src-dd1605a8587bb74236f558307f560c9a36bcd8f6.tar.bz2
try to fix win
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76889 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/first_run_bubble.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc
index d9ed8dbb..127387c 100644
--- a/chrome/browser/ui/views/first_run_bubble.cc
+++ b/chrome/browser/ui/views/first_run_bubble.cc
@@ -474,27 +474,28 @@ FirstRunBubble* FirstRunBubble::Show(Profile* profile,
const gfx::Rect& position_relative_to,
BubbleBorder::ArrowLocation arrow_location,
FirstRun::BubbleType bubble_type) {
- FirstRunBubble* window = new FirstRunBubble();
+ FirstRunBubble* bubble = new FirstRunBubble();
FirstRunBubbleViewBase* view = NULL;
switch (bubble_type) {
case FirstRun::OEM_BUBBLE:
- view = new FirstRunOEMBubbleView(window, profile);
+ view = new FirstRunOEMBubbleView(bubble, profile);
break;
case FirstRun::LARGE_BUBBLE:
- view = new FirstRunBubbleView(window, profile);
+ view = new FirstRunBubbleView(bubble, profile);
break;
case FirstRun::MINIMAL_BUBBLE:
- view = new FirstRunMinimalBubbleView(window, profile);
+ view = new FirstRunMinimalBubbleView(bubble, profile);
break;
default:
NOTREACHED();
}
- window->set_view(view);
- window->Init(parent, position_relative_to, arrow_location, view, window);
- window->GetFocusManager()->AddFocusChangeListener(view);
+ bubble->set_view(view);
+ bubble->InitBubble(
+ parent, position_relative_to, arrow_location, view, bubble);
+ bubble->GetFocusManager()->AddFocusChangeListener(view);
view->BubbleShown();
- return window;
+ return bubble;
}
FirstRunBubble::FirstRunBubble()