Re-land r51526

chrome/browser/views/options/general_page_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/views/options/options_page_view.h"
@@ skipping 44 matching lines @@
   virtual void ContentsChanged(views::Textfield* sender,
                                const std::wstring& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
                                const views::Textfield::Keystroke& key);
 
   // OptionsPageView implementation:
   virtual void InitControlLayout();
   virtual void NotifyPrefChanged(const std::wstring* pref_name);
   virtual void HighlightGroup(OptionsGroup highlight_group);
 
-  // views::View overrides:
-  virtual void Layout();
-
  private:
   // ShellIntegration::DefaultBrowserObserver implementation:
   // Updates the UI state to reflect the current default browser state.
   virtual void SetDefaultBrowserUIState(
       ShellIntegration::DefaultBrowserUIState state);
 
   // For Side by Side installs, this will disable the Default Browser setting
   // and display an explanitory message.
   void SetDefaultBrowserUIStateForSxS();
 
@@ skipping 73 matching lines @@
   views::Label* default_browser_status_label_;
   views::NativeButton* default_browser_use_as_default_button_;
 
   // The helper object that performs default browser set/check tasks.
   scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
 
   DISALLOW_COPY_AND_ASSIGN(GeneralPageView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_