| Index: views/controls/separator.h
|
| ===================================================================
|
| --- views/controls/separator.h (revision 17379)
|
| +++ views/controls/separator.h (working copy)
|
| @@ -5,30 +5,40 @@
|
| #ifndef VIEWS_CONTROLS_SEPARATOR_H_
|
| #define VIEWS_CONTROLS_SEPARATOR_H_
|
|
|
| -#include "views/controls/native_control.h"
|
| +#include <string>
|
|
|
| +#include "views/view.h"
|
| +
|
| namespace views {
|
|
|
| // The Separator class is a view that shows a line used to visually separate
|
| // other views. The current implementation is only horizontal.
|
|
|
| -class Separator : public NativeControl {
|
| +class Separator : public View {
|
| public:
|
| + // The separator's class name.
|
| + static const char kViewClassName[];
|
| +
|
| Separator();
|
| virtual ~Separator();
|
|
|
| - // NativeControl overrides:
|
| - virtual HWND CreateNativeControl(HWND parent_container);
|
| - virtual LRESULT OnNotify(int w_param, LPNMHDR l_param);
|
| -
|
| - // View overrides:
|
| + // Overridden from View:
|
| + virtual void Layout();
|
| virtual gfx::Size GetPreferredSize();
|
| + protected:
|
| + virtual void ViewHierarchyChanged(bool is_add, View* parent,
|
| + View* child);
|
| + virtual std::string GetClassName() const;
|
|
|
| private:
|
| + void CreateNativeWrapper();
|
|
|
| - DISALLOW_EVIL_CONSTRUCTORS(Separator);
|
| + // The native view.
|
| + View* native_wrapper_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(Separator);
|
| };
|
|
|
| } // namespace views
|
|
|
| -#endif // #define VIEWS_CONTROLS_SEPARATOR_H_
|
| +#endif // VIEWS_CONTROLS_SEPARATOR_H_
|
|
|