Index: chrome/browser/ui/views/chrome_views_delegate.h |
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h |
index 7585529cb30b4ef734dbf511d0a98afe0185749d..357a49824059de4689b56599956cbe544605c9d7 100644 |
--- a/chrome/browser/ui/views/chrome_views_delegate.h |
+++ b/chrome/browser/ui/views/chrome_views_delegate.h |
@@ -14,46 +14,45 @@ |
class ChromeViewsDelegate : public views::ViewsDelegate { |
public: |
ChromeViewsDelegate(); |
- virtual ~ChromeViewsDelegate(); |
+ ~ChromeViewsDelegate() override; |
// views::ViewsDelegate: |
- virtual void SaveWindowPlacement(const views::Widget* window, |
- const std::string& window_name, |
- const gfx::Rect& bounds, |
- ui::WindowShowState show_state) override; |
- virtual bool GetSavedWindowPlacement( |
- const views::Widget* widget, |
- const std::string& window_name, |
- gfx::Rect* bounds, |
- ui::WindowShowState* show_state) const override; |
- virtual void NotifyAccessibilityEvent( |
- views::View* view, ui::AXEvent event_type) override; |
- virtual void NotifyMenuItemFocused(const base::string16& menu_name, |
- const base::string16& menu_item_name, |
- int item_index, |
- int item_count, |
- bool has_submenu) override; |
+ void SaveWindowPlacement(const views::Widget* window, |
+ const std::string& window_name, |
+ const gfx::Rect& bounds, |
+ ui::WindowShowState show_state) override; |
+ bool GetSavedWindowPlacement(const views::Widget* widget, |
+ const std::string& window_name, |
+ gfx::Rect* bounds, |
+ ui::WindowShowState* show_state) const override; |
+ void NotifyAccessibilityEvent(views::View* view, |
+ ui::AXEvent event_type) override; |
+ void NotifyMenuItemFocused(const base::string16& menu_name, |
+ const base::string16& menu_item_name, |
+ int item_index, |
+ int item_count, |
+ bool has_submenu) override; |
#if defined(OS_WIN) |
virtual HICON GetDefaultWindowIcon() const override; |
virtual bool IsWindowInMetro(gfx::NativeWindow window) const override; |
#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) |
- virtual gfx::ImageSkia* GetDefaultWindowIcon() const override; |
+ gfx::ImageSkia* GetDefaultWindowIcon() const override; |
#endif |
#if defined(USE_ASH) |
- virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( |
+ views::NonClientFrameView* CreateDefaultNonClientFrameView( |
views::Widget* widget) override; |
#endif |
- virtual void AddRef() override; |
- virtual void ReleaseRef() override; |
- virtual void OnBeforeWidgetInit( |
+ void AddRef() override; |
+ void ReleaseRef() override; |
+ void OnBeforeWidgetInit( |
views::Widget::InitParams* params, |
views::internal::NativeWidgetDelegate* delegate) override; |
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
- virtual bool WindowManagerProvidesTitleBar(bool maximized) override; |
+ bool WindowManagerProvidesTitleBar(bool maximized) override; |
#endif |
#if defined(USE_AURA) |
- virtual ui::ContextFactory* GetContextFactory() override; |
+ ui::ContextFactory* GetContextFactory() override; |
#endif |
#if defined(OS_WIN) |
virtual int GetAppbarAutohideEdges(HMONITOR monitor, |