diff options
Diffstat (limited to 'views/controls/menu')
-rw-r--r-- | views/controls/menu/menu_host.cc | 2 | ||||
-rw-r--r-- | views/controls/menu/menu_host.h | 2 | ||||
-rw-r--r-- | views/controls/menu/menu_host_root_view.cc | 2 | ||||
-rw-r--r-- | views/controls/menu/menu_host_root_view.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/menu/menu_host.cc b/views/controls/menu/menu_host.cc index 70ea88c..82fd186 100644 --- a/views/controls/menu/menu_host.cc +++ b/views/controls/menu/menu_host.cc @@ -79,7 +79,7 @@ void MenuHost::ReleaseMenuHostCapture() { //////////////////////////////////////////////////////////////////////////////// // MenuHost, Widget overrides: -RootView* MenuHost::CreateRootView() { +internal::RootView* MenuHost::CreateRootView() { return new MenuHostRootView(this, submenu_); } diff --git a/views/controls/menu/menu_host.h b/views/controls/menu/menu_host.h index 1849de4..a33f445 100644 --- a/views/controls/menu/menu_host.h +++ b/views/controls/menu/menu_host.h @@ -65,7 +65,7 @@ class MenuHost : public Widget, private: // Overridden from Widget: - virtual RootView* CreateRootView() OVERRIDE; + virtual internal::RootView* CreateRootView() OVERRIDE; virtual bool ShouldReleaseCaptureOnMouseReleased() const OVERRIDE; // Overridden from NativeMenuHostDelegate: diff --git a/views/controls/menu/menu_host_root_view.cc b/views/controls/menu/menu_host_root_view.cc index e1c119f..b3676fa0 100644 --- a/views/controls/menu/menu_host_root_view.cc +++ b/views/controls/menu/menu_host_root_view.cc @@ -11,7 +11,7 @@ namespace views { MenuHostRootView::MenuHostRootView(Widget* widget, SubmenuView* submenu) - : RootView(widget), + : internal::RootView(widget), submenu_(submenu), forward_drag_to_menu_controller_(true) { } diff --git a/views/controls/menu/menu_host_root_view.h b/views/controls/menu/menu_host_root_view.h index 32200c5..11c674c 100644 --- a/views/controls/menu/menu_host_root_view.h +++ b/views/controls/menu/menu_host_root_view.h @@ -19,7 +19,7 @@ class SubmenuView; // // As all the menu items are owned by the root menu item, care must be taken // such that when MenuHostRootView is deleted it doesn't delete the menu items. -class MenuHostRootView : public RootView { +class MenuHostRootView : public internal::RootView { public: MenuHostRootView(Widget* widget, SubmenuView* submenu); |