views: Move grid_layout files into layout directory. Final Part.

chrome/browser/chromeos/login/user_controller.cc

 // Copyright (c) 2010 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/chromeos/login/user_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/stringprintf.h"
@@ skipping 11 matching lines @@
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/background.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 #include "views/painter.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
 using views::ColumnSet;
 using views::GridLayout;
 using views::WidgetGtk;
 
 namespace chromeos {
@@ skipping 466 matching lines @@
     return;
   }
   delegate_->RemoveUser(this);
 }
 
 void UserController::SelectUserRelative(int shift) {
   delegate_->SelectUser(user_index() + shift);
 }
 
 }  // namespace chromeos