Aura: Fix gray line at top of toolbar with translucent frames

chrome/browser/ui/views/frame/browser_frame_aura.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 "chrome/browser/ui/views/frame/browser_frame_aura.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
-#include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
-#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "grit/theme_resources_standard.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
-#include "ui/base/theme_provider.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/font.h"
 #include "ui/views/background.h"
 
 namespace {
 
-// The content left/right images have a shadow built into them.
-const int kContentEdgeShadowThickness = 2;
-
-// Background view to paint the gradient behind the back/forward/omnibox
-// toolbar area.
-class ToolbarBackground : public views::Background {
- public:
-  explicit ToolbarBackground(BrowserView* browser_view);
-  virtual ~ToolbarBackground();
-
-  // views::Background overrides:
-  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE;
-
- private:
-  BrowserView* browser_view_;
-  DISALLOW_COPY_AND_ASSIGN(ToolbarBackground);
-};
-
-ToolbarBackground::ToolbarBackground(BrowserView* browser_view)
-    : browser_view_(browser_view) {
-}
-
-ToolbarBackground::~ToolbarBackground() {
-}
-
-void ToolbarBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
-  gfx::Rect toolbar_bounds = browser_view_->GetToolbarBounds();
-  if (toolbar_bounds.IsEmpty())
-    return;
-
-  int x = toolbar_bounds.x();
-  int w = toolbar_bounds.width();
-  int y = toolbar_bounds.y();
-  int h = toolbar_bounds.bottom();
-
-  // Gross hack: We split the toolbar images into two pieces, since sometimes
-  // (popup mode) the toolbar isn't tall enough to show the whole image.  The
-  // split happens between the top shadow section and the bottom gradient
-  // section so that we never break the gradient.
-  int split_point = views::NonClientFrameView::kFrameShadowThickness * 2;
-  int bottom_y = y + split_point;
-  ui::ThemeProvider* tp = browser_view_->GetThemeProvider();
-  SkBitmap* toolbar_left = tp->GetBitmapNamed(IDR_CONTENT_TOP_LEFT_CORNER);
-  int bottom_edge_height = std::min(toolbar_left->height(), h) - split_point;
-
-  canvas->FillRect(gfx::Rect(x, bottom_y, w, bottom_edge_height),
-                   tp->GetColor(ThemeService::COLOR_TOOLBAR));
-
-  // Tile the toolbar image starting at the frame edge on the left and where the
-  // horizontal tabstrip is (or would be) on the top.
-  SkBitmap* theme_toolbar = tp->GetBitmapNamed(IDR_THEME_TOOLBAR);
-  canvas->TileImageInt(*theme_toolbar,
-                       x, bottom_y,
-                       x, bottom_y,
-                       w, theme_toolbar->height());
-
-  SkBitmap* toolbar_center =
-      tp->GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
-  canvas->TileImageInt(*toolbar_center,
-                       0, 0,
-                       x, y,
-                       w, split_point);
-
-  // Draw the content/toolbar separator.
-  canvas->FillRect(gfx::Rect(
-      x + views::NonClientFrameView::kClientEdgeThickness,
-      toolbar_bounds.bottom() - views::NonClientFrameView::kClientEdgeThickness,
-      w - (2 * views::NonClientFrameView::kClientEdgeThickness),
-      views::NonClientFrameView::kClientEdgeThickness),
-      ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // StatusAreaBoundsWatcher
 
 class StatusAreaBoundsWatcher : public aura::WindowObserver {
  public:
   explicit StatusAreaBoundsWatcher(BrowserFrame* frame)
       : frame_(frame),
         status_area_window_(NULL) {
     StartWatch();
   }
@@ skipping 93 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, public:
 
 BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame,
                                    BrowserView* browser_view)
     : views::NativeWidgetAura(browser_frame),
       browser_view_(browser_view),
       window_property_watcher_(new WindowPropertyWatcher(this, browser_frame)) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(ash::switches::kAuraTranslucentFrames)) {
-    // Background only needed for Aura-style windows.
-    browser_view_->set_background(new ToolbarBackground(browser_view));
-  }
   GetNativeWindow()->SetName("BrowserFrameAura");
   GetNativeWindow()->AddObserver(window_property_watcher_.get());
 }
 
 BrowserFrameAura::~BrowserFrameAura() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, views::NativeWidgetAura overrides:
 
@@ skipping 33 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameAura(browser_frame, browser_view);
 }