Change style of ConstrainedWindowViews.

chrome/browser/ui/views/web_intent_picker_views.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
+#include "grit/shared_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ipc/ipc_message.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/views/window/non_client_view.h"
 
-// TODO(binji): The current constrained dialog implementation already has a
-// close button. Remove this define and the #if checks below when we switch to
-// the new implementation.
-// #define USE_CLOSE_BUTTON
-
 using content::WebContents;
 using views::GridLayout;
 
 namespace {
 
 // The space in pixels between the top-level groups and the dialog border.
 const int kContentAreaBorder = 12;
 
 // The minimum size to display the constrained dialog.
 const int kDialogMinWidth = 400;
@@ skipping 642 matching lines @@
   // Initialize the contents of the picker. After this call, contents_ will be
   // non-NULL.
   void InitContents();
 
   // Restore the contents of the picker to the initial contents.
   void ResetContents();
 
   // Resize the constrained window to the size of its contents.
   void SizeToContents();
 
-#if defined(USE_CLOSE_BUTTON)
   // Returns a new close button.
   views::ImageButton* CreateCloseButton();
-#endif
 
   // A weak pointer to the WebIntentPickerDelegate to notify when the user
   // chooses a service or cancels.
   WebIntentPickerDelegate* delegate_;
 
   // A weak pointer to the picker model.
   WebIntentPickerModel* model_;
 
   // A weak pointer to the service button view.
   // Created locally, owned by Views.
@@ skipping 79 matching lines @@
   // Show the dialog.
   window_ = new ConstrainedWindowViews(tab_contents, this);
 }
 
 WebIntentPickerViews::~WebIntentPickerViews() {
   model_->set_observer(NULL);
 }
 
 void WebIntentPickerViews::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
-#if defined(USE_CLOSE_BUTTON)
-  delegate_->OnPickerCancelled();
-#endif
+  delegate_->OnPickerClosed();
 }
 
 void WebIntentPickerViews::WindowClosing() {
   delegate_->OnClosing();
 }
 
 void WebIntentPickerViews::DeleteDelegate() {
   delete this;
 }
 
@@ skipping 115 matching lines @@
   views::ColumnSet* header_cs = grid_layout->AddColumnSet(0);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Icon.
   header_cs->AddPaddingColumn(0, 4);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Title.
   header_cs->AddPaddingColumn(0, 4);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Link.
   header_cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing);
-#if defined(USE_CLOSE_BUTTON)
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Close Button.
-#endif
 
   views::ColumnSet* full_cs = grid_layout->AddColumnSet(1);
   full_cs->AddColumn(GridLayout::FILL, GridLayout::FILL, 1.0,
                      GridLayout::USE_PREF, 0, 0);
 
   const WebIntentPickerModel::InstalledService* service =
       model_->GetInstalledServiceWithURL(model_->inline_disposition_url());
 
   // Header row.
   grid_layout->StartRow(0, 0);
   views::ImageView* icon = new views::ImageView();
   icon->SetImage(service->favicon.ToImageSkia());
   grid_layout->AddView(icon);
 
   string16 elided_title = ui::ElideText(
       service->title, gfx::Font(), kTitleLinkMaxWidth, ui::ELIDE_AT_END);
   views::Label* title = new views::Label(elided_title);
   grid_layout->AddView(title);
   // Add link for "choose another service" if other suggestions are available
   // or if more than one (the current) service is installed.
   if (model_->GetInstalledServiceCount() > 1 ||
        model_->GetSuggestedExtensionCount()) {
     choose_another_service_link_ = new views::Link(
         l10n_util::GetStringUTF16(IDS_INTENT_PICKER_USE_ALTERNATE_SERVICE));
     grid_layout->AddView(choose_another_service_link_);
     choose_another_service_link_->set_listener(this);
   }
 
-#if defined(USE_CLOSE_BUTTON)
   grid_layout->AddView(CreateCloseButton());
-#endif
 
   // Inline web contents row.
   grid_layout->StartRow(0, 1);
   grid_layout->AddView(webview_, 1, 1, GridLayout::CENTER,
                        GridLayout::CENTER, 0, 0);
   contents_->Layout();
   SizeToContents();
   displaying_web_contents_ = true;
 }
 
@@ skipping 96 matching lines @@
   views::GridLayout* grid_layout = new views::GridLayout(contents_);
   contents_->SetLayoutManager(grid_layout);
 
   grid_layout->set_minimum_size(gfx::Size(kDialogMinWidth, 0));
   grid_layout->SetInsets(kContentAreaBorder, kContentAreaBorder,
                          kContentAreaBorder, kContentAreaBorder);
   views::ColumnSet* header_cs = grid_layout->AddColumnSet(kHeaderRowColumnSet);
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Title.
   header_cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing);
-#if defined(USE_CLOSE_BUTTON)
   header_cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                        GridLayout::USE_PREF, 0, 0);  // Close Button.
-#endif
 
   views::ColumnSet* full_cs = grid_layout->AddColumnSet(kFullWidthColumnSet);
   full_cs->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                      GridLayout::USE_PREF, 0, 0);
 
   views::ColumnSet* indent_cs =
       grid_layout->AddColumnSet(kIndentedFullWidthColumnSet);
   indent_cs->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing);
   indent_cs->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                        GridLayout::USE_PREF, 0, 0);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   // Header row.
   grid_layout->StartRow(0, kHeaderRowColumnSet);
   action_label_ = new views::Label();
   action_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   action_label_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   grid_layout->AddView(action_label_);
 
-#if defined(USE_CLOSE_BUTTON)
   grid_layout->AddView(CreateCloseButton());
-#endif
 
   // Padding row.
   grid_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Service button row.
   grid_layout->StartRow(0, kFullWidthColumnSet);
   service_buttons_ = new ServiceButtonsView(model_, this);
   grid_layout->AddView(service_buttons_);
 
   // Row with app suggestions label.
@@ skipping 44 matching lines @@
 }
 
 void WebIntentPickerViews::SizeToContents() {
   gfx::Size client_size = contents_->GetPreferredSize();
   gfx::Rect client_bounds(client_size);
   gfx::Rect new_window_bounds = window_->non_client_view()->frame_view()->
       GetWindowBoundsForClientBounds(client_bounds);
   window_->CenterWindow(new_window_bounds.size());
 }
 
-#if defined(USE_CLOSE_BUTTON)
 views::ImageButton* WebIntentPickerViews::CreateCloseButton() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
+                          rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X));
   close_button->SetImage(views::CustomButton::BS_HOT,
-                          rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
+                          rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
   close_button->SetImage(views::CustomButton::BS_PUSHED,
-                          rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
+                          rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
   return close_button;
 }
-#endif