Another set of icons for the launcher. The chrome logo now shows the

app list, hence code changes to shuffle things around.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: http://codereview.chromium.org/8957012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114666 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 37 insertions, 54 deletions

diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
index aa73802..7750f8c 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/ui/views/aura/app_list_window.h"
 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "grit/theme_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/launcher/launcher_types.h"
 #include "ui/aura_shell/window_util.h"
@@ -76,7 +75,3 @@ bool ChromeShellDelegate::ConfigureLauncherItem(
   return view &&
       ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type));
 }
-
-int ChromeShellDelegate::GetResourceIDForNewBrowserWindow() {
-  return IDR_PRODUCT_LOGO_32;
-}
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.h b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
index eb355d3..a524f30 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.h
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
@@ -44,7 +44,6 @@ class ChromeShellDelegate : public aura_shell::ShellDelegate {
   virtual void LauncherItemClicked(
       const aura_shell::LauncherItem& item) OVERRIDE;
   virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE;
-  virtual int GetResourceIDForNewBrowserWindow() OVERRIDE;
 
  private:
   static ChromeShellDelegate* instance_;
diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc
index 93363a8..0700047 100644
--- a/ui/aura_shell/examples/aura_shell_main.cc
+++ b/ui/aura_shell/examples/aura_shell_main.cc
@@ -7,7 +7,6 @@
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "grit/ui_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura_shell/examples/toplevel_window.h"
 #include "ui/aura_shell/launcher/launcher_types.h"
@@ -93,10 +92,6 @@ class ShellDelegateImpl : public aura_shell::ShellDelegate {
     image_count = (image_count + 1) % 3;
     return true;  // Makes the entry show up in the launcher.
   }
-
-  virtual int GetResourceIDForNewBrowserWindow() OVERRIDE {
-    return IDR_AURA_LAUNCHER_ICON_CHROME;
-  }
 };
 
 }  // namespace
diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ui/aura_shell/launcher/launcher_view.cc
index 9434a5a..68a8ed8 100644
--- a/ui/aura_shell/launcher/launcher_view.cc
+++ b/ui/aura_shell/launcher/launcher_view.cc
@@ -206,16 +206,18 @@ void LauncherView::Init() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   model_->AddObserver(this);
 
-  new_browser_button_ = new views::ImageButton(this);
-  ShellDelegate* delegate = Shell::GetInstance()->delegate();
-  int new_browser_button_image_id = delegate ?
-      delegate->GetResourceIDForNewBrowserWindow() :
-      IDR_AURA_LAUNCHER_ICON_CHROME;
-  new_browser_button_->SetImage(
+  show_apps_button_ = new views::ImageButton(this);
+  show_apps_button_->SetImage(
       views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(new_browser_button_image_id).ToSkBitmap());
-  ConfigureChildView(new_browser_button_);
-  AddChildView(new_browser_button_);
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToSkBitmap());
+  show_apps_button_->SetImage(
+      views::CustomButton::BS_HOT,
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).ToSkBitmap());
+  show_apps_button_->SetImage(
+      views::CustomButton::BS_PUSHED,
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).ToSkBitmap());
+  ConfigureChildView(show_apps_button_);
+  AddChildView(show_apps_button_);
 
   const LauncherItems& items(model_->items());
   for (LauncherItems::const_iterator i = items.begin(); i != items.end(); ++i) {
@@ -225,18 +227,18 @@ void LauncherView::Init() {
     AddChildView(child);
   }
 
-  show_apps_button_ = new views::ImageButton(this);
-  show_apps_button_->SetImage(
+  new_browser_button_ = new views::ImageButton(this);
+  new_browser_button_->SetImage(
       views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToSkBitmap());
-  show_apps_button_->SetImage(
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_NEW_BROWSER).ToSkBitmap());
+  new_browser_button_->SetImage(
       views::CustomButton::BS_HOT,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).ToSkBitmap());
-  show_apps_button_->SetImage(
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_NEW_BROWSER_HOT).ToSkBitmap());
+  new_browser_button_->SetImage(
       views::CustomButton::BS_PUSHED,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).ToSkBitmap());
-  ConfigureChildView(show_apps_button_);
-  AddChildView(show_apps_button_);
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED).ToSkBitmap());
+  ConfigureChildView(new_browser_button_);
+  AddChildView(new_browser_button_);
 
   overflow_button_ = new views::ImageButton(this);
   overflow_button_->SetImage(
@@ -257,8 +259,8 @@ void LauncherView::Init() {
 void LauncherView::LayoutToIdealBounds() {
   IdealBounds ideal_bounds;
   CalculateIdealBounds(&ideal_bounds);
-  new_browser_button_->SetBoundsRect(ideal_bounds.new_browser_bounds);
   show_apps_button_->SetBoundsRect(ideal_bounds.show_apps_bounds);
+  new_browser_button_->SetBoundsRect(ideal_bounds.new_browser_bounds);
   ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
 }
 
@@ -267,12 +269,14 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
   if (!available_width)
     return;
 
-  // new_browser_button first.
+  // show_apps_button_ first.
   int x = kLeadingInset;
-  gfx::Size pref = new_browser_button_->GetPreferredSize();
-  bounds->new_browser_bounds = gfx::Rect(
+  gfx::Size pref = show_apps_button_->GetPreferredSize();
+  bounds->show_apps_bounds = gfx::Rect(
       x, (kPreferredHeight - pref.height()) / 2, pref.width(), pref.height());
-  x += bounds->new_browser_bounds.width() + kHorizontalPadding;
+  x += bounds->show_apps_bounds.width() + kHorizontalPadding;
+  // TODO: remove when we get better images.
+  x -= 6;
 
   // Then launcher buttons.
   for (int i = 0; i < view_model_->view_size(); ++i) {
@@ -283,11 +287,11 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
     x += pref.width() + kHorizontalPadding;
   }
 
-  // Show apps button and overflow button.
-  bounds->show_apps_bounds.set_size(show_apps_button_->GetPreferredSize());
+  // new_browser_button_ and overflow button.
+  bounds->new_browser_bounds.set_size(new_browser_button_->GetPreferredSize());
   bounds->overflow_bounds.set_size(overflow_button_->GetPreferredSize());
   int last_visible_index = DetermineLastVisibleIndex(
-      available_width - kLeadingInset - bounds->show_apps_bounds.width() -
+      available_width - kLeadingInset - bounds->new_browser_bounds.width() -
       kHorizontalPadding - bounds->overflow_bounds.width() -
       kHorizontalPadding);
   bool show_overflow = (last_visible_index + 1 != view_model_->view_size());
@@ -311,10 +315,9 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
         (kPreferredHeight - bounds->overflow_bounds.height()) / 2);
     x = bounds->overflow_bounds.right() + kHorizontalPadding;
   }
-  // TODO(sky): -6 is a hack, remove when we get better images.
-  bounds->show_apps_bounds.set_x(x - 6);
-  bounds->show_apps_bounds.set_y(
-      (kPreferredHeight - bounds->show_apps_bounds.height()) / 2);
+  bounds->new_browser_bounds.set_x(x);
+  bounds->new_browser_bounds.set_y(
+      (kPreferredHeight - bounds->new_browser_bounds.height()) / 2);
 }
 
 int LauncherView::DetermineLastVisibleIndex(int max_x) {
@@ -474,7 +477,7 @@ void LauncherView::CancelDrag(views::View* deleted_view) {
 gfx::Size LauncherView::GetPreferredSize() {
   IdealBounds ideal_bounds;
   CalculateIdealBounds(&ideal_bounds);
-  return gfx::Size(ideal_bounds.show_apps_bounds.right() + kLeadingInset,
+  return gfx::Size(ideal_bounds.new_browser_bounds.right() + kLeadingInset,
                    kPreferredHeight);
 }
 
diff --git a/ui/aura_shell/shell_delegate.h b/ui/aura_shell/shell_delegate.h
index 1239bc8..982ef8d 100644
--- a/ui/aura_shell/shell_delegate.h
+++ b/ui/aura_shell/shell_delegate.h
@@ -50,10 +50,6 @@ class AURA_SHELL_EXPORT ShellDelegate {
   // an entry for |item->window| it should configure |item| appropriately and
   // return true.
   virtual bool ConfigureLauncherItem(LauncherItem* item) = 0;
-
-  // Returns the resource id of the image to show on the button that creates a
-  // new browser window.
-  virtual int GetResourceIDForNewBrowserWindow() = 0;
 };
 }  // namespace aura_shell
 
diff --git a/ui/aura_shell/test/test_shell_delegate.cc b/ui/aura_shell/test/test_shell_delegate.cc
index 98057f9..42414b7 100644
--- a/ui/aura_shell/test/test_shell_delegate.cc
+++ b/ui/aura_shell/test/test_shell_delegate.cc
@@ -4,8 +4,6 @@
 
 #include "ui/aura_shell/test/test_shell_delegate.h"
 
-#include "grit/ui_resources.h"
-
 namespace aura_shell {
 namespace test {
 
@@ -34,9 +32,5 @@ bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) {
   return true;
 }
 
-int TestShellDelegate::GetResourceIDForNewBrowserWindow() {
-  return IDR_AURA_LAUNCHER_ICON_CHROME;
-}
-
 }  // namespace test
 }  // namespace aura_shell
diff --git a/ui/aura_shell/test/test_shell_delegate.h b/ui/aura_shell/test/test_shell_delegate.h
index 91a55b4..6811d45 100644
--- a/ui/aura_shell/test/test_shell_delegate.h
+++ b/ui/aura_shell/test/test_shell_delegate.h
@@ -25,7 +25,6 @@ class TestShellDelegate : public ShellDelegate {
       const SetWidgetCallback& callback) OVERRIDE;
   virtual void LauncherItemClicked(const LauncherItem& item) OVERRIDE;
   virtual bool ConfigureLauncherItem(LauncherItem* item) OVERRIDE;
-  virtual int GetResourceIDForNewBrowserWindow() OVERRIDE;
 };
 
 }  // namespace test
diff --git a/ui/resources/aura/applist.png b/ui/resources/aura/applist.png
index 6356352..5f89378 100644
--- a/ui/resources/aura/applist.png
+++ b/ui/resources/aura/applist.png
diff --git a/ui/resources/aura/applist_h.png b/ui/resources/aura/applist_h.png
index a79c08a..462f8df 100644..100755
--- a/ui/resources/aura/applist_h.png
+++ b/ui/resources/aura/applist_h.png
diff --git a/ui/resources/aura/applist_p.png b/ui/resources/aura/applist_p.png
index 7bb7b4d..2485200 100644..100755
--- a/ui/resources/aura/applist_p.png
+++ b/ui/resources/aura/applist_p.png
diff --git a/ui/resources/aura/chromium-32.png b/ui/resources/aura/chromium-32.png
deleted file mode 100644
index 5e3adba..0000000
--- a/ui/resources/aura/chromium-32.png
+++ /dev/null
diff --git a/ui/resources/aura/new_browser.png b/ui/resources/aura/new_browser.png
new file mode 100644
index 0000000..e12dd7c
--- /dev/null
+++ b/ui/resources/aura/new_browser.png
diff --git a/ui/resources/aura/new_browser_h.png b/ui/resources/aura/new_browser_h.png
new file mode 100644
index 0000000..68cd141
--- /dev/null
+++ b/ui/resources/aura/new_browser_h.png
diff --git a/ui/resources/aura/new_browser_p.png b/ui/resources/aura/new_browser_p.png
new file mode 100644
index 0000000..aa99b75
--- /dev/null
+++ b/ui/resources/aura/new_browser_p.png
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index a67f53e..5bd9a37 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -133,7 +133,9 @@
 
       <!-- Images only used by Aura. -->
       <if expr="pp_ifdef('use_aura')">
-        <include name="IDR_AURA_LAUNCHER_ICON_CHROME" file="aura/chromium-32.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER" file="aura/new_browser.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_HOT" file="aura/new_browser_h.png" type="BINDATA" />
+        <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED" file="aura/new_browser_p.png" type="BINDATA" />
         <include name="IDR_AURA_LAUNCHER_OVERFLOW" file="aura/launcher_overflow.png" type="BINDATA" />
         <include name="IDR_AURA_LAUNCHER_OVERFLOW_HOT" file="aura/launcher_overflow_h.png" type="BINDATA" />
         <include name="IDR_AURA_LAUNCHER_OVERFLOW_PUSHED" file="aura/launcher_overflow_p.png" type="BINDATA" />