Handful of related instant changes:

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "app/bidi_line_iterator.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "app/text_elider.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
-#include "chrome/browser/instant/instant_opt_in.h"
+#include "chrome/browser/instant/instant_confirm_dialog.h"
+#include "chrome/browser/instant/promo_counter.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/views/bubble_border.h"
 #include "chrome/browser/views/location_bar/location_bar_view.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/color_utils.h"
 #include "gfx/insets.h"
 #include "gfx/path.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
@@ skipping 95 matching lines @@
 #else
 // Don't adjust font on chromeos as it becomes too small.
 const int kEditFontAdjust = 0;
 #endif
 
 // Horizontal padding between the buttons on the opt in promo.
 const int kOptInButtonPadding = 2;
 
 // Padding around the opt in view.
 const int kOptInLeftPadding = 12;
-const int kOptInRightPadding = 6;
+const int kOptInRightPadding = 10;
 const int kOptInTopPadding = 6;
-const int kOptInBottomPadding = 3;
+const int kOptInBottomPadding = 5;
 
-// Padding between the top of the opt-in view and the separator.
-const int kOptInSeparatorSpacing = 2;
+// Horizontal/Vertical inset of the promo background.
+const int kOptInBackgroundHInset = 6;
+const int kOptInBackgroundVInset = 2;
 
 // Border for instant opt-in buttons. Consists of two 9 patch painters: one for
 // the normal state, the other for the pressed state.
 class OptInButtonBorder : public views::Border {
  public:
   OptInButtonBorder() {
     border_painter_.reset(CreatePainter(IDR_OPT_IN_BUTTON));
     border_pushed_painter_.reset(CreatePainter(IDR_OPT_IN_BUTTON_P));
   }
 
@@ skipping 35 matching lines @@
 
 }  // namespace
 
 class AutocompletePopupContentsView::InstantOptInView
     : public views::View,
       public views::ButtonListener {
  public:
   InstantOptInView(AutocompletePopupContentsView* contents_view,
                    const gfx::Font& label_font,
                    const gfx::Font& button_font)
-      : contents_view_(contents_view) {
+      : contents_view_(contents_view),
+        bg_painter_(views::Painter::CreateVerticalGradient(
+                        SkColorSetRGB(255, 242, 183),
+                        SkColorSetRGB(250, 230, 145))) {
     views::Label* label =
         new views::Label(l10n_util::GetString(IDS_INSTANT_OPT_IN_LABEL));
     label->SetFont(label_font);
 
     views::GridLayout* layout = new views::GridLayout(this);
     layout->SetInsets(kOptInTopPadding, kOptInLeftPadding,
                       kOptInBottomPadding, kOptInRightPadding);
     SetLayoutManager(layout);
 
     const int first_column_set = 1;
@@ skipping 14 matching lines @@
     layout->AddView(CreateButton(IDS_INSTANT_OPT_IN_NO_THANKS, button_font));
   }
 
   virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
     contents_view_->UserPressedOptIn(
         sender->tag() == IDS_INSTANT_OPT_IN_ENABLE);
     // WARNING: we've been deleted.
   }
 
   virtual void Paint(gfx::Canvas* canvas) {
-    SkColor line_color = color_utils::AlphaBlend(GetColor(NORMAL, DIMMED_TEXT),
-                                                 GetColor(NORMAL, BACKGROUND),
-                                                 48);
-    canvas->DrawLineInt(
-        line_color, 0, kOptInSeparatorSpacing, width(), kOptInSeparatorSpacing);
+    canvas->Save();
+    canvas->TranslateInt(kOptInBackgroundHInset, kOptInBackgroundVInset);
+    bg_painter_->Paint(width() - kOptInBackgroundHInset * 2,
+                       height() - kOptInBackgroundVInset * 2, canvas);
+    canvas->DrawRectInt(ResourceBundle::toolbar_separator_color, 0, 0,
+                        width() - kOptInBackgroundHInset * 2,
+                        height() - kOptInBackgroundVInset * 2);
+    canvas->Restore();
   }
 
  private:
   // Creates and returns a button configured for the opt-in promo.
   views::View* CreateButton(int id, const gfx::Font& font) {
     // NOTE: we can't use NativeButton as the popup is a layered window and
     // native buttons don't draw  in layered windows.
     // TODO: these buttons look crap. Figure out the right border/background to
     // use.
     views::TextButton* button =
         new views::TextButton(this, l10n_util::GetString(id));
     button->set_border(new OptInButtonBorder());
     button->SetNormalHasBorder(true);
     button->set_tag(id);
     button->SetFont(font);
     button->set_animate_on_state_change(false);
     return button;
   }
 
   AutocompletePopupContentsView* contents_view_;
+  scoped_ptr<views::Painter> bg_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantOptInView);
 };
 
 class AutocompleteResultView : public views::View {
  public:
   AutocompleteResultView(AutocompleteResultViewModel* model,
                          int model_index,
                          const gfx::Font& font,
                          const gfx::Font& bold_font);
@@ skipping 577 matching lines @@
     } else {
       result_view = static_cast<AutocompleteResultView*>(GetChildViewAt(i));
       result_view->SetVisible(true);
     }
     result_view->set_match(GetMatchAtIndex(i));
     total_child_height += result_view->GetPreferredSize().height();
   }
   for (size_t i = model_->result().size(); i < child_rv_count; ++i)
     GetChildViewAt(i)->SetVisible(false);
 
-  if (!opt_in_view_ && browser::ShouldShowInstantOptIn(model_->profile())) {
+  PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
+  if (!opt_in_view_ && counter && counter->ShouldShow(base::Time::Now())) {
     opt_in_view_ = new InstantOptInView(this, result_bold_font_, result_font_);
     AddChildView(opt_in_view_);
+  } else if (opt_in_view_ && (!counter ||
+                              !counter->ShouldShow(base::Time::Now()))) {
+    delete opt_in_view_;
+    opt_in_view_ = NULL;
   }
 
   if (opt_in_view_)
     total_child_height += opt_in_view_->GetPreferredSize().height();
 
   gfx::Rect new_target_bounds = CalculateTargetBounds(total_child_height);
 
   // If we're animating and our target height changes, reset the animation.
   // NOTE: If we just reset blindly on _every_ update, then when the user types
   // rapidly we could get "stuck" trying repeatedly to animate shrinking by the
@@ skipping 313 matching lines @@
   gfx::Point location_bar_origin(location_bar_bounds.origin());
   views::View::ConvertPointToScreen(location_bar_, &location_bar_origin);
   location_bar_bounds.set_origin(location_bar_origin);
   return bubble_border_->GetBounds(
       location_bar_bounds, gfx::Size(location_bar_bounds.width(), h));
 }
 
 void AutocompletePopupContentsView::UserPressedOptIn(bool opt_in) {
   delete opt_in_view_;
   opt_in_view_ = NULL;
-  browser::UserPickedInstantOptIn(location_bar_->GetWindow()->GetNativeWindow(),
-                                  model_->profile(), opt_in);
+  PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
+  DCHECK(counter);
+  counter->Hide();
+  if (opt_in) {
+    browser::ShowInstantConfirmDialogIfNecessary(
+        location_bar_->GetWindow()->GetNativeWindow(), model_->profile());
+  }
   UpdatePopupAppearance();
 }