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

chrome/browser/ui/views/options/advanced_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/advanced_page_view.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/browser/ui/views/options/advanced_contents_view.h"
 #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h"
 #include "chrome/common/chrome_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/message_box_flags.h"
 #include "views/controls/message_box_view.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/scroll_view.h"
-#include "views/grid_layout.h"
+#include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 namespace {
 
 // A dialog box that asks the user to confirm resetting settings.
 class ResetDefaultsConfirmBox : public views::DialogDelegate {
  public:
   // This box is modal to |parent_hwnd|.
@@ skipping 108 matching lines @@
       new ManagedPrefsBannerView(profile()->GetPrefs(), OPTIONS_PAGE_ADVANCED));
 
   layout->StartRow(1, single_column_view_set_id);
   layout->AddView(advanced_scroll_view_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(reset_to_default_button_, 1, 1,
                   GridLayout::TRAILING, GridLayout::CENTER);
 }