Move app/gfx/canvas and app/gfx/font to gfx/.

chrome/browser/views/tabs/native_view_photobooth_win.cc

 // Copyright (c) 2006-2008 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/browser/views/tabs/native_view_photobooth_win.h"
 
-#include "app/gfx/canvas.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/canvas.h"
 #include "gfx/point.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/widget/widget_win.h"
 
 namespace {
 
 static BOOL CALLBACK MonitorEnumProc(HMONITOR monitor, HDC monitor_dc,
                                      RECT* monitor_rect, LPARAM data) {
   gfx::Point* point = reinterpret_cast<gfx::Point*>(data);
   if (monitor_rect->right > point->x() && monitor_rect->bottom > point->y()) {
@@ skipping 138 matching lines @@
   capture_window_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW);
   capture_window_->Init(NULL, capture_bounds);
   // If the capture window isn't visible, blitting from the TabContents'
   // HWND's DC to the capture bitmap produces blankness.
   capture_window_->Show();
   SetLayeredWindowAttributes(
       capture_window_->GetNativeView(), RGB(0xFF, 0xFF, 0xFF), 0xFF, LWA_ALPHA);
 
   Replace(initial_hwnd);
 }