Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/extensions/extension_shelf.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/extensions/extension_shelf.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/extensions/extension_view.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
-#include "gfx/canvas_skia.h"
 #include "views/controls/label.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 
 namespace {
 
 // This is the slight padding that is there around the edge of the browser. This
 // has been determined empirically.
 // TODO(sidchat): Compute this value from the root view of the extension shelf.
 static const int kExtensionShelfPaddingOnLeft = 4;
@@ skipping 898 matching lines @@
       SkIntToScalar(0),
       SkIntToScalar(width()),
       SkIntToScalar(height())
   };
 
   // Tell all extension views about the new background.
   int count = model_->count();
   for (int i = 0; i < count; ++i) {
     ExtensionView* view = ToolstripAtIndex(i)->view();
 
-    const SkBitmap& background =
-        canvas->AsCanvasSkia()->getDevice()->accessBitmap(false);
+    const SkBitmap& background = canvas->getDevice()->accessBitmap(false);
 
     SkRect mapped_subset = background_rect;
     gfx::Rect view_bounds = view->bounds();
     mapped_subset.offset(SkIntToScalar(view_bounds.x()),
                          SkIntToScalar(view_bounds.y()));
-    bool result =
-        canvas->AsCanvasSkia()->getTotalMatrix().mapRect(&mapped_subset);
+    bool result = canvas->getTotalMatrix().mapRect(&mapped_subset);
     DCHECK(result);
 
     SkIRect isubset;
     mapped_subset.round(&isubset);
     SkBitmap subset_bitmap;
     // This will create another bitmap that just references pixels in the
     // actual bitmap.
     result = background.extractSubset(&subset_bitmap, isubset);
     if (!result)
       return;
@@ skipping 133 matching lines @@
 }
 
 void ExtensionShelf::OnFullscreenToggled(bool fullscreen) {
   if (fullscreen == fullscreen_)
     return;
   fullscreen_ = fullscreen;
   if (!IsAlwaysShown())
     return;
   size_animation_->Reset(fullscreen ? 0 : 1);
 }