Move browser/views to browser/ui/views

TBR=brettw
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4694005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65508 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 55 deletions

diff --git a/chrome/browser/views/options/options_group_view.h b/chrome/browser/views/options/options_group_view.h
index b79a36e..b3bf71b 100644
--- a/chrome/browser/views/options/options_group_view.h
+++ b/chrome/browser/views/options/options_group_view.h
@@ -2,62 +2,12 @@
 // 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_OPTIONS_GROUP_VIEW_H__
-#define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__
+#ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_
+#define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_
 #pragma once
 
-#include "views/view.h"
+#include "chrome/browser/ui/views/options/options_group_view.h"
+// TODO(beng): remove this file once all includes have been updated.
 
-namespace views {
-class Label;
-class Separator;
-};
+#endif  // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_
 
-///////////////////////////////////////////////////////////////////////////////
-// OptionsGroupView
-//
-//  A helper View that gathers related options into groups with a title and
-//  optional description.
-//
-class OptionsGroupView : public views::View {
- public:
-  OptionsGroupView(views::View* contents,
-                   const std::wstring& title,
-                   const std::wstring& description,
-                   bool show_separator);
-  virtual ~OptionsGroupView();
-
-  // Sets the group as being highlighted to attract attention.
-  void SetHighlighted(bool highlighted);
-
-  // Retrieves the width of the ContentsView. Used to help size wrapping items.
-  int GetContentsWidth() const;
-
- protected:
-  // views::View overrides:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual void Paint(gfx::Canvas* canvas);
-  virtual void ViewHierarchyChanged(bool is_add,
-                                    views::View* parent,
-                                    views::View* child);
-
- private:
-  void Init();
-
-  views::View* contents_;
-  views::Label* title_label_;
-  views::Label* description_label_;
-  views::Separator* separator_;
-
-  // True if we should show a separator line below the contents of this
-  // section.
-  bool show_separator_;
-
-  // True if this section should have a highlighted treatment to draw the
-  // user's attention.
-  bool highlighted_;
-
-  DISALLOW_COPY_AND_ASSIGN(OptionsGroupView);
-};
-
-#endif  // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__