Remove IDR_BUBBLE_SHADOW, use IDR_WINDOW_BUBBLE_SHADOW_BIG.

Remove the IDRs, asset files, and example usage.
These assets were only used for the fullscreen bubble.
Use some highly similar and more common assets instead.
Tweak its padding to accommodate slightly larger assets.
See before/after at: http://crbug.com/181257#c14

BUG=181257,313400
TEST=Fullscreen bubble looks slightly different, no other change.
R=sky@chromium.org,yzshen@chromium.org,oshima@chromium.org,scheib@chromium.org

Review URL: https://codereview.chromium.org/53703002

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

13 files changed, 2 insertions, 31 deletions

diff --git a/ui/resources/default_100_percent/bubble_shadow_bottom.png b/ui/resources/default_100_percent/bubble_shadow_bottom.png
deleted file mode 100644
index b3f694a..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_bottom.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/bubble_shadow_bottom_left.png b/ui/resources/default_100_percent/bubble_shadow_bottom_left.png
deleted file mode 100644
index 54bbc11..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_bottom_left.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/bubble_shadow_bottom_right.png b/ui/resources/default_100_percent/bubble_shadow_bottom_right.png
deleted file mode 100644
index 8c4043a..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_bottom_right.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/bubble_shadow_left.png b/ui/resources/default_100_percent/bubble_shadow_left.png
deleted file mode 100644
index 44d79cd..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_left.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/bubble_shadow_right.png b/ui/resources/default_100_percent/bubble_shadow_right.png
deleted file mode 100644
index 98d6b81..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_right.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/bubble_shadow_top.png b/ui/resources/default_100_percent/bubble_shadow_top.png
deleted file mode 100644
index d578750..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_top.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/bubble_shadow_top_left.png b/ui/resources/default_100_percent/bubble_shadow_top_left.png
deleted file mode 100644
index 7bb4196..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_top_left.png
+++ /dev/null
diff --git a/ui/resources/default_100_percent/bubble_shadow_top_right.png b/ui/resources/default_100_percent/bubble_shadow_top_right.png
deleted file mode 100644
index ae3e54d..0000000
--- a/ui/resources/default_100_percent/bubble_shadow_top_right.png
+++ /dev/null
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index dee0e0d..2e17560f 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -126,14 +126,6 @@
       <structure type="chrome_scaled_image" name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_left.png" />
       <structure type="chrome_scaled_image" name="IDR_BUBBLE_R" file="bubble_right.png" />
       <structure type="chrome_scaled_image" name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_right.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_B" file="bubble_shadow_bottom.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_BL" file="bubble_shadow_bottom_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_BR" file="bubble_shadow_bottom_right.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_L" file="bubble_shadow_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_R" file="bubble_shadow_right.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_T" file="bubble_shadow_top.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_TL" file="bubble_shadow_top_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_TR" file="bubble_shadow_top_right.png" />
       <structure type="chrome_scaled_image" name="IDR_BUBBLE_T" file="bubble_top.png" />
       <structure type="chrome_scaled_image" name="IDR_BUBBLE_TL" file="bubble_top_left.png" />
       <structure type="chrome_scaled_image" name="IDR_BUBBLE_TR" file="bubble_top_right.png" />
diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc
index 6494c7b..0ea5057 100644
--- a/ui/views/bubble/bubble_border.cc
+++ b/ui/views/bubble/bubble_border.cc
@@ -75,12 +75,6 @@ const int kStroke = 1;
 
 // Bubble border and arrow image resource ids. They don't use the IMAGE_GRID
 // macro because there is no center image.
-const int kShadowImages[] =  {
-    IDR_BUBBLE_SHADOW_TL, IDR_BUBBLE_SHADOW_T, IDR_BUBBLE_SHADOW_TR,
-    IDR_BUBBLE_SHADOW_L,  0,                   IDR_BUBBLE_SHADOW_R,
-    IDR_BUBBLE_SHADOW_BL, IDR_BUBBLE_SHADOW_B, IDR_BUBBLE_SHADOW_BR };
-const int kShadowArrows[] = { 0, 0, 0, 0 };
-
 const int kNoShadowImages[] = {
     IDR_BUBBLE_TL, IDR_BUBBLE_T, IDR_BUBBLE_TR,
     IDR_BUBBLE_L,  0,            IDR_BUBBLE_R,
@@ -134,11 +128,6 @@ BorderImages* GetBorderImages(BubbleBorder::Shadow shadow) {
     return set;
 
   switch (shadow) {
-    case BubbleBorder::SHADOW:
-      // Note: SHADOW's border interior thickness is actually 10, but 0 is used
-      // here to match the legacy appearance of SHADOW's extra large inset.
-      set = new BorderImages(kShadowImages, kShadowArrows, 0, 0, 3);
-      break;
     case BubbleBorder::NO_SHADOW:
     case BubbleBorder::NO_SHADOW_OPAQUE_BORDER:
       set = new BorderImages(kNoShadowImages, kNoShadowArrows, 6, 7, 4);
@@ -380,10 +369,6 @@ void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   gfx::Rect bounds(view->GetLocalBounds());
   bounds.Inset(border_->GetInsets());
 
-  // Note: This matches the legacy appearance of SHADOW's extra large inset.
-  if (border_->shadow() == BubbleBorder::SHADOW)
-    bounds.Inset(-10, -10);
-
   SkScalar radius = SkIntToScalar(border_->GetBorderCornerRadius());
   path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
   canvas->DrawPath(path, paint);
diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h
index f1b58c6..23fdde3 100644
--- a/ui/views/bubble/bubble_border.h
+++ b/ui/views/bubble/bubble_border.h
@@ -54,8 +54,7 @@ class VIEWS_EXPORT BubbleBorder : public Border {
   };
 
   enum Shadow {
-    SHADOW    = 0,
-    NO_SHADOW,
+    NO_SHADOW = 0,
     NO_SHADOW_OPAQUE_BORDER,
     BIG_SHADOW,
     SMALL_SHADOW,
diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc
index b9498f4..6869b46 100644
--- a/ui/views/examples/bubble_example.cc
+++ b/ui/views/examples/bubble_example.cc
@@ -71,8 +71,6 @@ void BubbleExample::CreateExampleView(View* container) {
   PrintStatus("Click with optional modifiers: [Ctrl] for set_arrow(NONE), "
      "[Alt] for set_arrow(FLOAT), or [Shift] to reverse the arrow iteration.");
   container->SetLayoutManager(new BoxLayout(BoxLayout::kHorizontal, 0, 0, 10));
-  shadow_ = new LabelButton(this, ASCIIToUTF16("Shadow"));
-  container->AddChildView(shadow_);
   no_shadow_ = new LabelButton(this, ASCIIToUTF16("No Shadow"));
   container->AddChildView(no_shadow_);
   big_shadow_ = new LabelButton(this, ASCIIToUTF16("Big Shadow"));
@@ -100,9 +98,7 @@ void BubbleExample::ButtonPressed(Button* sender, const ui::Event& event) {
   ExampleBubble* bubble = new ExampleBubble(sender, arrow);
   bubble->set_color(colors[(color_index++) % arraysize(colors)]);
 
-  if (sender == shadow_)
-    bubble->set_shadow(BubbleBorder::SHADOW);
-  else if (sender == no_shadow_)
+  if (sender == no_shadow_)
     bubble->set_shadow(BubbleBorder::NO_SHADOW);
   else if (sender == big_shadow_)
     bubble->set_shadow(BubbleBorder::BIG_SHADOW);
diff --git a/ui/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h
index 4ad763a..fd0008e 100644
--- a/ui/views/examples/bubble_example.h
+++ b/ui/views/examples/bubble_example.h
@@ -23,7 +23,6 @@ class BubbleExample : public ExampleBase, public ButtonListener {
  private:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
-  Button* shadow_;
   Button* no_shadow_;
   Button* big_shadow_;
   Button* small_shadow_;