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

Side by Side 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: Restore NOTREACHED() in IsCommandEnabled(). 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h"
10 #include "build/build_config.h" 11 #include "build/build_config.h"
11 #include "ui/base/accessibility/accessibility_types.h" 12 #include "ui/base/accessibility/accessibility_types.h"
12 #include "views/views_delegate.h" 13 #include "views/views_delegate.h"
13 14
14 namespace views { 15 namespace views {
15 class Window; 16 class Window;
16 } 17 }
17 18
18 class ChromeViewsDelegate : public views::ViewsDelegate { 19 class ChromeViewsDelegate : public views::ViewsDelegate {
19 public: 20 public:
(...skipping 20 matching lines...) Expand all
40 int item_index, 41 int item_index,
41 int item_count, 42 int item_count,
42 bool has_submenu); 43 bool has_submenu);
43 44
44 #if defined(OS_WIN) 45 #if defined(OS_WIN)
45 virtual HICON GetDefaultWindowIcon() const; 46 virtual HICON GetDefaultWindowIcon() const;
46 #endif 47 #endif
47 virtual void AddRef(); 48 virtual void AddRef();
48 virtual void ReleaseRef(); 49 virtual void ReleaseRef();
49 50
51 virtual int GetDispositionForEvent(int event_flags) OVERRIDE;
sky 2011/05/25 15:41:12 It looks weird to have one OVERRIDE, but not all.
rhashimoto 2011/05/25 16:24:37 Done.
52
50 private: 53 private:
51 DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate); 54 DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
52 }; 55 };
53 56
54 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_ 57 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698