Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 45 matching lines @@
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"

[Nico, 2012/08/16 20:26:27]

can this go?

[pkotwicz, 2012/08/16 21:32:31]

SkBitmap is still used by LocationBarViewMac::GetKeywordImage

[Nico, 2012/08/16 21:35:06]

But only in reference form, so the definition shouldn't be necessary (?).
Doesn't matter much though.

 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 
 using content::WebContents;
 
 namespace {
 
 // Vertical space between the bottom edge of the location_bar and the first run
 // bubble arrow point.
 const static int kFirstRunBubbleYOffset = 1;
 
 }
@@ skipping 231 matching lines @@
 
 void LocationBarViewMac::OnSetFocus() {
   // Update the keyword and search hint states.
   OnChanged();
 }
 
 void LocationBarViewMac::OnKillFocus() {
   // Do nothing.
 }
 
-SkBitmap LocationBarViewMac::GetFavicon() const {
+gfx::Image LocationBarViewMac::GetFavicon() const {
   return browser_->GetCurrentPageIcon();
 }
 
 string16 LocationBarViewMac::GetTitle() const {
   return browser_->GetWindowTitleForCurrentTab();
 }
 
 InstantController* LocationBarViewMac::GetInstant() {
   return browser_->instant_controller()->instant();
 }
@@ skipping 396 matching lines @@
 void LocationBarViewMac::UpdateChromeToMobileEnabled() {
   if (!chrome_to_mobile_decoration_.get())
     return;
 
   DCHECK(ChromeToMobileService::IsChromeToMobileEnabled());
   bool enabled = [field_ isEditable] && !toolbar_model_->input_in_progress() &&
       ChromeToMobileServiceFactory::GetForProfile(profile_)->HasMobiles();
   chrome_to_mobile_decoration_->SetVisible(enabled);
   command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled);
 }