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

chrome/browser/chromeos/text_input/candidate_window.cc

 // Copyright (c) 2009 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.
 //
 // TODO(satorux):
 // - Implement a scroll bar or an indicator showing where you are in the
 //   candidate window.
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "app/app_paths.h"
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/at_exit.h"
 #include "base/file_path.h"
 #include "base/observer_list.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/common/chrome_paths.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "third_party/cros/chromeos_cros_api.h"
 #include "third_party/cros/chromeos_ime.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/event.h"
 #include "views/fill_layout.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/grid_layout.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
@@ skipping 921 matching lines @@
   // Create the candidate window controller.
   chromeos::CandidateWindowController controller;
   controller.Init();
 
   // Start the main loop.
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->Run(&accelerator_handler);
 
   return 0;
 }