ash/wm: Do not use deprecated ResourceBundle::GetBitmapNamed() function.

Instead use the recommended ResourceBundle::GetImageNamed() function and
convert it to the native type appropriately.

BUG=58030
R=ben@chromium.org,jamescook@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9592020

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

1 files changed, 13 insertions, 13 deletions

diff --git a/ash/wm/frame_painter.h b/ash/wm/frame_painter.h
index 5f26ef0..cc82a2d 100644
--- a/ash/wm/frame_painter.h
+++ b/ash/wm/frame_painter.h
@@ -40,18 +40,19 @@ class ASH_EXPORT FramePainter {
             views::ImageButton* close_button);
 
   // Helpers for views::NonClientFrameView implementations.
-  gfx::Rect GetBoundsForClientView(
-      int top_height, const gfx::Rect& window_bounds) const;
+  gfx::Rect GetBoundsForClientView(int top_height,
+                                   const gfx::Rect& window_bounds) const;
   gfx::Rect GetWindowBoundsForClientBounds(
-      int top_height, const gfx::Rect& client_bounds) const;
+      int top_height,
+      const gfx::Rect& client_bounds) const;
   int NonClientHitTest(views::NonClientFrameView* view,
                        const gfx::Point& point);
 
   // Paints the frame header.
   void PaintHeader(views::NonClientFrameView* view,
                    gfx::Canvas* canvas,
-                   SkBitmap* theme_frame,
-                   SkBitmap* theme_frame_overlay);
+                   const SkBitmap* theme_frame,
+                   const SkBitmap* theme_frame_overlay);
 
   // Paint the title bar, primarily the title string.
   void PaintTitleBar(views::NonClientFrameView* view,
@@ -60,8 +61,7 @@ class ASH_EXPORT FramePainter {
 
   // Performs layout for the header based on whether we want the shorter
   // |maximized_layout| appearance.
-  void LayoutHeader(views::NonClientFrameView* view,
-                    bool maximized_layout);
+  void LayoutHeader(views::NonClientFrameView* view, bool maximized_layout);
 
  private:
   // Sets the images for a button base on IDs from the |frame_| theme provider.
@@ -77,12 +77,12 @@ class ASH_EXPORT FramePainter {
   views::ImageButton* close_button_;
 
   // Window frame header/caption parts.
-  SkBitmap* button_separator_;
-  SkBitmap* top_left_corner_;
-  SkBitmap* top_edge_;
-  SkBitmap* top_right_corner_;
-  SkBitmap* header_left_edge_;
-  SkBitmap* header_right_edge_;
+  const SkBitmap* button_separator_;
+  const SkBitmap* top_left_corner_;
+  const SkBitmap* top_edge_;
+  const SkBitmap* top_right_corner_;
+  const SkBitmap* header_left_edge_;
+  const SkBitmap* header_right_edge_;
 
   DISALLOW_COPY_AND_ASSIGN(FramePainter);
 };