Move src/gfx/ to src/ui/gfx...

gfx/favicon_size.h

Index: gfx/favicon_size.h
===================================================================
--- gfx/favicon_size.h	(revision 73487)
+++ gfx/favicon_size.h	(working copy)
@@ -6,29 +6,7 @@
 #define APP_GFX_FAVICON_SIZE_H_
 #pragma once
 
-#include "base/compiler_specific.h"
+#include "ui/gfx/favicon_size.h"
+// TODO(sail): remove this file once all includes have been updated.
 
-// Size (along each axis) of the favicon.
-const int kFavIconSize = 16;
-
-// If the width or height is bigger than the favicon size, a new width/height
-// is calculated and returned in width/height that maintains the aspect
-// ratio of the supplied values.
-static void calc_favicon_target_size(int* width, int* height) ALLOW_UNUSED;
-
-// static
-void calc_favicon_target_size(int* width, int* height) {
-  if (*width > kFavIconSize || *height > kFavIconSize) {
-    // Too big, resize it maintaining the aspect ratio.
-    float aspect_ratio = static_cast<float>(*width) /
-                         static_cast<float>(*height);
-    *height = kFavIconSize;
-    *width = static_cast<int>(aspect_ratio * *height);
-    if (*width > kFavIconSize) {
-      *width = kFavIconSize;
-      *height = static_cast<int>(*width / aspect_ratio);
-    }
-  }
-}
-
 #endif  // APP_GFX_FAVICON_SIZE_H_