Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1877)

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.h

Issue 7067032: Add MenuModelAdapter to wrap ui::MenuModel with views::MenuDelegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Implemented reviewer recommendations. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b115ce40e4cdcc04733ac1cab585b28b7f2e01fd..9811f8ff4fc4aba76c332613d79e421cdc43cfbb 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -7,6 +7,7 @@
#pragma once
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "build/build_config.h"
#include "ui/base/accessibility/accessibility_types.h"
#include "views/views_delegate.h"
@@ -21,31 +22,33 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
virtual ~ChromeViewsDelegate() {}
// Overridden from views::ViewsDelegate:
- virtual ui::Clipboard* GetClipboard() const;
+ virtual ui::Clipboard* GetClipboard() const OVERRIDE;
virtual void SaveWindowPlacement(views::Window* window,
const std::wstring& window_name,
const gfx::Rect& bounds,
- bool maximized);
+ bool maximized) OVERRIDE;
virtual bool GetSavedWindowBounds(views::Window* window,
const std::wstring& window_name,
- gfx::Rect* bounds) const;
+ gfx::Rect* bounds) const OVERRIDE;
virtual bool GetSavedMaximizedState(views::Window* window,
const std::wstring& window_name,
- bool* maximized) const;
+ bool* maximized) const OVERRIDE;
virtual void NotifyAccessibilityEvent(
- views::View* view, ui::AccessibilityTypes::Event event_type);
+ views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE;
virtual void NotifyMenuItemFocused(
const std::wstring& menu_name,
const std::wstring& menu_item_name,
int item_index,
int item_count,
- bool has_submenu);
+ bool has_submenu) OVERRIDE;
#if defined(OS_WIN)
- virtual HICON GetDefaultWindowIcon() const;
+ virtual HICON GetDefaultWindowIcon() const OVERRIDE;
#endif
- virtual void AddRef();
- virtual void ReleaseRef();
+ virtual void AddRef() OVERRIDE;
+ virtual void ReleaseRef() OVERRIDE;
+
+ virtual int GetDispositionForEvent(int event_flags) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698