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

chrome/browser/ui/views/options/general_page_view.cc

 // Copyright (c) 2011 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/ui/views/options/general_page_view.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 22 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/label.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/textfield/textfield.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 
 namespace {
 
 // All the options pages are in the same view hierarchy. This means we need to
 // make sure group identifiers don't collide across different pages.
 const int kStartupRadioGroup = 101;
 const int kHomePageRadioGroup = 102;
 const SkColor kDefaultBrowserLabelColor = SkColorSetRGB(0, 135, 0);
 const SkColor kNotDefaultBrowserLabelColor = SkColorSetRGB(135, 0, 0);
@@ skipping 835 matching lines @@
   }
   homepage_use_url_textfield_->SetEnabled(enabled);
   homepage_use_url_textfield_->SetReadOnly(!enabled);
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->selected_item();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }