move favicon download code from chrome/ into content/

content/renderer/favicon_helper.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/renderer/favicon_helper.h"
+#include "content/renderer/favicon_helper.h"
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/message_loop.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/favicon_url.h"
-#include "chrome/common/icon_messages.h"
+#include "content/common/icon_messages.h"
+#include "content/public/common/favicon_url.h"
 #include "content/public/renderer/render_view.h"
 #include "net/base/data_url.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "webkit/glue/image_decoder.h"
 #include "webkit/glue/multi_resolution_image_resource_fetcher.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::FaviconURL;

[jam, 2012/11/27 01:16:31]

nit: get rid of this

[Cait (Slow), 2012/11/28 00:11:45]

Done.

 using WebKit::WebFrame;
 using WebKit::WebIconURL;
 using WebKit::WebVector;
 using WebKit::WebURL;
 using WebKit::WebURLRequest;
 using webkit_glue::MultiResolutionImageResourceFetcher;
 
+namespace {
+  bool TouchEnabled() {

[jam, 2012/11/27 01:16:31]

nit: put the anonymous namespace inside the content namespace, and also don't
indent the function

[Cait (Slow), 2012/11/28 00:11:45]

Done.

+    CommandLine* cmdline = CommandLine::ForCurrentProcess();
+    return (cmdline->HasSwitch(switches::kTouchEvents) &&
+            cmdline->GetSwitchValueASCII(switches::kTouchEvents) ==
+                switches::kTouchEventsEnabled);
+  }
+} // namespace
+
+namespace content {
+
 static FaviconURL::IconType ToFaviconType(WebIconURL::Type type) {
   switch (type) {
     case WebIconURL::TypeFavicon:
       return FaviconURL::FAVICON;
     case WebIconURL::TypeTouch:
       return FaviconURL::TOUCH_ICON;
     case WebIconURL::TypeTouchPrecomposed:
       return FaviconURL::TOUCH_PRECOMPOSED_ICON;
     case WebIconURL::TypeInvalid:
       return FaviconURL::INVALID_ICON;
   }
   return FaviconURL::INVALID_ICON;
 }
 
-FaviconHelper::FaviconHelper(content::RenderView* render_view)
-    : content::RenderViewObserver(render_view) {
+FaviconHelper::FaviconHelper(RenderView* render_view)
+    : RenderViewObserver(render_view) {
 }
 
 FaviconHelper::~FaviconHelper() {
 }
 
 void FaviconHelper::OnDownloadFavicon(int id,
                                       const GURL& image_url,
                                       int image_size) {
   std::vector<SkBitmap> result_images;
   if (image_url.SchemeIs("data")) {
@@ skipping 74 matching lines @@
   IPC_BEGIN_MESSAGE_MAP(FaviconHelper, message)
     IPC_MESSAGE_HANDLER(IconMsg_DownloadFavicon, OnDownloadFavicon)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void FaviconHelper::DidStopLoading() {
   int icon_types = WebIconURL::TypeFavicon;
-  if (chrome::kEnableTouchIcon)
+  if (TouchEnabled())
     icon_types |= WebIconURL::TypeTouchPrecomposed | WebIconURL::TypeTouch;
 
   WebVector<WebIconURL> icon_urls =
       render_view()->GetWebView()->mainFrame()->iconURLs(icon_types);
   std::vector<FaviconURL> urls;
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url, ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(routing_id(), render_view()->GetPageId(), urls);
 }
 
 void FaviconHelper::DidChangeIcon(WebKit::WebFrame* frame,
                                   WebKit::WebIconURL::Type icon_type) {
   if (frame->parent())
     return;
 
-  if (!chrome::kEnableTouchIcon &&
-      icon_type != WebIconURL::TypeFavicon)
+  if (!TouchEnabled() && icon_type != WebIconURL::TypeFavicon)
     return;
 
   WebVector<WebIconURL> icon_urls = frame->iconURLs(icon_type);
   std::vector<FaviconURL> urls;
   for (size_t i = 0; i < icon_urls.size(); i++) {
     urls.push_back(FaviconURL(icon_urls[i].iconURL(),
                               ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(routing_id(), render_view()->GetPageId(), urls);
 }
+
+} // namespace content