Enables HiDPI favicon to be displayed in tab strip on CrOS

chrome/browser/ui/views/tabs/tab_renderer_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_
 
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/search/toolbar_search_animator.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 // Wraps the state needed by the renderers.
 struct TabRendererData {
   // Different types of network activity for a tab. The NetworkState of a tab
   // may be used to alter the UI (e.g. show different kinds of loading
   // animations).
   enum NetworkState {
     NETWORK_STATE_NONE,     // no network activity.
     NETWORK_STATE_WAITING,  // waiting for a connection.
     NETWORK_STATE_LOADING,  // connected, transferring data.
   };
 
   TabRendererData();
   ~TabRendererData();
 
   // This interprets the crashed status to decide whether or not this
   // render data represents a tab that is "crashed" (i.e. the render
   // process died unexpectedly).
   bool IsCrashed() const {
     return (crashed_status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ||
             crashed_status == base::TERMINATION_STATUS_PROCESS_CRASHED ||
             crashed_status == base::TERMINATION_STATUS_ABNORMAL_TERMINATION);
   }
 
-  // Returns true if the TabRendererData is same as given |data|. Two favicons
-  // are considered equals if two SkBitmaps point to the same SkPixelRef object.
+  // Returns true if the TabRendererData is same as given |data|.
   bool Equals(const TabRendererData& data);
 
-  SkBitmap favicon;
+  gfx::ImageSkia favicon;
   NetworkState network_state;
   string16 title;
   GURL url;
   bool loading;
   base::TerminationStatus crashed_status;
   bool incognito;
   bool show_icon;
   bool mini;
   bool blocked;
   bool app;
   chrome::search::Mode::Type mode;
   // Only applicable if |mode| is chrome::search::Mode::SEARCH.
   chrome::search::ToolbarSearchAnimator::BackgroundState background_state;
   // Only applicable if |background_state| is or a combination including
   // chrome::search::ToolbarSearchAnimator::BACKGROUND_STATE_SHOW_NEW;
   double search_background_opacity;
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_TAB_RENDERER_DATA_H_