summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/resources/locale_settings.grd2
-rw-r--r--chrome/browser/views/first_run_bubble.cc7
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 0c52705..b62af88 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -510,7 +510,7 @@
<!-- The width and height of the First Run Search Information mini -->
<!-- bubble in characters and lines (See above). -->
<message name="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS" use_name_for_id="true">
- 70
+ 58
</message>
<message name="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES" use_name_for_id="true">
4
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 7dedfd3..ba8edb2 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -332,7 +332,9 @@ void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) {
kLingerTime);
}
- InfoBubble::OnActivate(action, minimized, window);
+ // Keep window from automatically closing until kLingerTime has passed.
+ if (::IsWindowEnabled(GetParent()))
+ InfoBubble::OnActivate(action, minimized, window);
}
void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
@@ -369,4 +371,7 @@ FirstRunBubble* FirstRunBubble::Show(Profile* profile, views::Window* parent,
void FirstRunBubble::EnableParent() {
::EnableWindow(GetParent(), true);
+ // Reactivate the FirstRunBubble so it responds to OnActivate messages.
+ SetWindowPos(GetParent(), 0, 0, 0, 0,
+ SWP_NOSIZE | SWP_NOMOVE | SWP_NOREDRAW | SWP_SHOWWINDOW);
}