summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/first_run.cc15
-rw-r--r--chrome/browser/first_run.h5
-rw-r--r--chrome/browser/location_bar.h2
-rw-r--r--chrome/browser/views/first_run_bubble.cc150
-rw-r--r--chrome/browser/views/first_run_bubble.h9
-rw-r--r--chrome/browser/views/location_bar_view.cc8
-rw-r--r--chrome/browser/views/location_bar_view.h4
7 files changed, 170 insertions, 23 deletions
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index 7dbb3df..3a24488 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -266,6 +266,9 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
}
}
+ if (parse_result & installer_util::MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE)
+ FirstRun::SetOEMFirstRunBubblePref();
+
FilePath user_prefs = FilePath::FromWStringHack(
GetDefaultPrefFilePath(true, user_data_dir.ToWStringHack()));
if (user_prefs.empty())
@@ -640,6 +643,18 @@ bool FirstRun::SetShowFirstRunBubblePref() {
return true;
}
+bool FirstRun::SetOEMFirstRunBubblePref() {
+ PrefService* local_state = g_browser_process->local_state();
+ if (!local_state)
+ return false;
+ if (!local_state->IsPrefRegistered(prefs::kShouldUseOEMFirstRunBubble)) {
+ local_state->RegisterBooleanPref(prefs::kShouldUseOEMFirstRunBubble,
+ false);
+ local_state->SetBoolean(prefs::kShouldUseOEMFirstRunBubble, true);
+ }
+ return true;
+}
+
bool FirstRun::SetShowWelcomePagePref() {
PrefService* local_state = g_browser_process->local_state();
if (!local_state)
diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index d11e0b4..737cd00 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -76,6 +76,11 @@ class FirstRun {
// the pref could not be set.
static bool SetShowFirstRunBubblePref();
+ // Sets the kShouldUseOEMFirstRunBubble local state pref so that the
+ // browser shows the OEM first run bubble once the main message loop
+ // gets going. Returns false if the pref could not be set.
+ static bool SetOEMFirstRunBubblePref();
+
// Sets the kShouldShowWelcomePage local state pref so that the browser
// loads the welcome tab once the message loop gets going. Returns false
// if the pref could not be set.
diff --git a/chrome/browser/location_bar.h b/chrome/browser/location_bar.h
index 70a06d5..218f65c 100644
--- a/chrome/browser/location_bar.h
+++ b/chrome/browser/location_bar.h
@@ -22,7 +22,7 @@ class TabContents;
class LocationBar {
public:
// Shows the first run information bubble anchored to the location bar.
- virtual void ShowFirstRunBubble() = 0;
+ virtual void ShowFirstRunBubble(bool use_OEM_bubble) = 0;
// Returns the string of text entered in the location bar.
virtual std::wstring GetInputString() const = 0;
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 0ca491c..df5000e 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -16,8 +16,10 @@
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
+#include "grit/theme_resources.h"
#include "views/event.h"
#include "views/controls/button/native_button.h"
+#include "views/controls/button/image_button.h"
#include "views/controls/label.h"
#include "views/focus/focus_manager.h"
#include "views/standard_layout.h"
@@ -29,6 +31,17 @@ namespace {
// provides.
static const int kBubblePadding = 4;
+// How much extra padding to put around our content over what the InfoBubble
+// provides in alternative OEM bubble.
+static const int kOEMBubblePadding = 4;
+
+// Padding between parts of strings on the same line (for instance,
+// "New!" and "Search from the address bar!"
+static const int kStringSeparationPadding = 2;
+
+// Margin around close button.
+static const int kMarginRightOfCloseButton = 7;
+
std::wstring GetDefaultSearchEngineName(Profile* profile) {
if (!profile) {
NOTREACHED();
@@ -47,11 +60,18 @@ std::wstring GetDefaultSearchEngineName(Profile* profile) {
} // namespace
-// Implements the client view inside the first run bubble. It is kind of a
-// dialog-ish view, but is not a true dialog.
-class FirstRunBubbleView : public views::View,
- public views::ButtonListener,
- public views::FocusChangeListener {
+// Base class for implementations of the client view which appears inside the
+// first run bubble. It is a dialog-ish view, but is not a true dialog.
+class FirstRunBubbleViewBase : public views::View,
+ public views::ButtonListener,
+ public views::FocusChangeListener {
+ public:
+ // Called by FirstRunBubble::Show to request focus for the proper button
+ // in the FirstRunBubbleView when it is shown.
+ virtual void BubbleShown() = 0;
+};
+
+class FirstRunBubbleView : public FirstRunBubbleViewBase {
public:
FirstRunBubbleView(FirstRunBubble* bubble_window, Profile* profile)
: bubble_window_(bubble_window),
@@ -103,7 +123,6 @@ class FirstRunBubbleView : public views::View,
keep_button_->RequestFocus();
}
- // Overridden from ButtonListener.
virtual void ButtonPressed(views::Button* sender) {
bubble_window_->Close();
if (change_button_ == sender) {
@@ -115,7 +134,6 @@ class FirstRunBubbleView : public views::View,
}
}
- // Overridden from views::View.
virtual void Layout() {
gfx::Size canvas = GetPreferredSize();
@@ -157,7 +175,6 @@ class FirstRunBubbleView : public views::View,
pref_size.width(), pref_size.height());
}
- // Overridden from views::View.
virtual gfx::Size GetPreferredSize() {
return gfx::Size(views::Window::GetLocalizedContentsSize(
IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS,
@@ -190,6 +207,111 @@ class FirstRunBubbleView : public views::View,
DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleView);
};
+class FirstRunOEMBubbleView : public FirstRunBubbleViewBase {
+ public:
+ FirstRunOEMBubbleView(FirstRunBubble* bubble_window, Profile* profile)
+ : bubble_window_(bubble_window),
+ label1_(NULL),
+ label2_(NULL),
+ label3_(NULL),
+ close_button_(NULL) {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ gfx::Font& font = rb.GetFont(ResourceBundle::MediumFont);
+
+ label1_ = new views::Label(
+ l10n_util::GetString(IDS_FR_OEM_BUBBLE_TITLE_1));
+ label1_->SetFont(font.DeriveFont(3, gfx::Font::BOLD));
+ label1_->SetColor(SK_ColorRED);
+ label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+ AddChildView(label1_);
+
+ label2_ = new views::Label(
+ l10n_util::GetString(IDS_FR_OEM_BUBBLE_TITLE_2));
+ label2_->SetFont(font.DeriveFont(3, gfx::Font::BOLD));
+ label2_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+ AddChildView(label2_);
+
+ gfx::Size ps = GetPreferredSize();
+
+ label3_ = new views::Label(
+ l10n_util::GetString(IDS_FR_OEM_BUBBLE_SUBTEXT));
+ label3_->SetMultiLine(true);
+ label3_->SetFont(font);
+ label3_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+ label3_->SizeToFit(ps.width() - kOEMBubblePadding * 2);
+ AddChildView(label3_);
+
+ close_button_ = new views::ImageButton(this);
+ close_button_->SetImage(views::CustomButton::BS_NORMAL,
+ rb.GetBitmapNamed(IDR_CLOSE_BAR));
+ close_button_->SetImage(views::CustomButton::BS_HOT,
+ rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
+ close_button_->SetImage(views::CustomButton::BS_PUSHED,
+ rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
+
+ AddChildView(close_button_);
+ }
+
+ void BubbleShown() {
+ // No button in oem_bubble to request focus.
+ }
+
+ virtual void ButtonPressed(views::Button* sender) {
+ bubble_window_->Close();
+ }
+
+ virtual void Layout() {
+ gfx::Size canvas = GetPreferredSize();
+
+ // First, draw the close button on the far right.
+ gfx::Size sz = close_button_->GetPreferredSize();
+ close_button_->SetBounds(canvas.width() - sz.width() -
+ kMarginRightOfCloseButton,
+ kOEMBubblePadding,
+ sz.width(),
+ sz.height());
+
+ gfx::Size pref_size = label1_->GetPreferredSize();
+ label1_->SetBounds(kOEMBubblePadding, kOEMBubblePadding,
+ pref_size.width() + kOEMBubblePadding * 2,
+ pref_size.height());
+
+ pref_size = label2_->GetPreferredSize();
+ label2_->SetBounds(kOEMBubblePadding * 2 + label1_->
+ GetPreferredSize().width(),
+ kOEMBubblePadding,
+ canvas.width() - kOEMBubblePadding * 2,
+ pref_size.height());
+
+ int next_v_space = label1_->y() + pref_size.height() +
+ kRelatedControlSmallVerticalSpacing;
+
+ pref_size = label3_->GetPreferredSize();
+ label3_->SetBounds(kOEMBubblePadding, next_v_space,
+ canvas.width() - kOEMBubblePadding * 2,
+ pref_size.height());
+ }
+
+ virtual gfx::Size GetPreferredSize() {
+ return gfx::Size(views::Window::GetLocalizedContentsSize(
+ IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS,
+ IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES));
+ }
+
+ virtual void FocusWillChange(View* focused_before, View* focused_now) {
+ // No buttons in oem_bubble to register focus changes.
+ }
+
+ private:
+ FirstRunBubble* bubble_window_;
+ views::Label* label1_;
+ views::Label* label2_;
+ views::Label* label3_;
+ views::ImageButton* close_button_;
+
+ DISALLOW_COPY_AND_ASSIGN(FirstRunOEMBubbleView);
+};
+
// Keep the bubble around for kLingerTime milliseconds, to prevent accidental
// closure.
static const int kLingerTime = 1000;
@@ -201,8 +323,6 @@ void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) {
if (action == WA_ACTIVE && !has_been_activated_) {
has_been_activated_ = true;
- // Disable the browser to prevent accidental rapid clicks from closing the
- // bubble.
::EnableWindow(GetParent(), false);
MessageLoop::current()->PostDelayedTask(FROM_HERE,
@@ -210,6 +330,7 @@ void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) {
&FirstRunBubble::EnableParent),
kLingerTime);
}
+
InfoBubble::OnActivate(action, minimized, window);
}
@@ -226,9 +347,14 @@ void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
// static
FirstRunBubble* FirstRunBubble::Show(Profile* profile, HWND parent_hwnd,
- const gfx::Rect& position_relative_to) {
+ const gfx::Rect& position_relative_to,
+ bool use_OEM_bubble) {
FirstRunBubble* window = new FirstRunBubble();
- FirstRunBubbleView* view = new FirstRunBubbleView(window, profile);
+ FirstRunBubbleViewBase* view = NULL;
+ if (use_OEM_bubble)
+ view = new FirstRunOEMBubbleView(window, profile);
+ else
+ view = new FirstRunBubbleView(window, profile);
window->SetDelegate(window);
window->set_view(view);
window->Init(parent_hwnd, position_relative_to, view);
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);
};
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 415334e..83c23c9 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -936,7 +936,7 @@ void LocationBarView::ShowInfoBubbleTask::Cancel() {
// -----------------------------------------------------------------------------
-void LocationBarView::ShowFirstRunBubbleInternal() {
+void LocationBarView::ShowFirstRunBubbleInternal(bool use_OEM_bubble) {
if (!location_entry_view_)
return;
if (!location_entry_view_->GetWidget()->IsActive()) {
@@ -965,7 +965,7 @@ void LocationBarView::ShowFirstRunBubbleInternal() {
FirstRunBubble::Show(profile_,
location_entry_view_->GetRootView()->GetWidget()->GetNativeView(),
- bounds);
+ bounds, use_OEM_bubble);
}
// LocationBarImageView---------------------------------------------------------
@@ -1169,10 +1169,10 @@ bool LocationBarView::OverrideAccelerator(
////////////////////////////////////////////////////////////////////////////////
// LocationBarView, LocationBar implementation:
-void LocationBarView::ShowFirstRunBubble() {
+void LocationBarView::ShowFirstRunBubble(bool use_OEM_bubble) {
// We wait 30 milliseconds to open. It allows less flicker.
Task* task = first_run_bubble_.NewRunnableMethod(
- &LocationBarView::ShowFirstRunBubbleInternal);
+ &LocationBarView::ShowFirstRunBubbleInternal, use_OEM_bubble);
MessageLoop::current()->PostDelayedTask(FROM_HERE, task, 30);
}
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index b0648d7..e81c5fc 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -111,7 +111,7 @@ class LocationBarView : public LocationBar,
virtual bool OverrideAccelerator(const views::Accelerator& accelerator);
// Overridden from LocationBar:
- virtual void ShowFirstRunBubble();
+ virtual void ShowFirstRunBubble(bool use_OEM_bubble);
virtual std::wstring GetInputString() const;
virtual WindowOpenDisposition GetWindowOpenDisposition() const;
virtual PageTransition::Type GetPageTransition() const;
@@ -416,7 +416,7 @@ class LocationBarView : public LocationBar,
void OnMouseEvent(const views::MouseEvent& event, UINT msg);
// Helper to show the first run info bubble.
- void ShowFirstRunBubbleInternal();
+ void ShowFirstRunBubbleInternal(bool use_OEM_bubble);
// Current profile. Not owned by us.
Profile* profile_;
generated by cgit v1.1 at 2025-02-13 06:20:03 +0000