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

Unified Diff: views/examples/example_base.cc

Issue 6155011: Implementing context menu for the new views textfield. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: resolved small merge conflict Created 9 years, 11 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
« no previous file with comments | « views/controls/textfield/textfield_views_model.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/examples/example_base.cc
diff --git a/views/examples/example_base.cc b/views/examples/example_base.cc
index d27651a5a9f82759f631c9176f14be9f38d8a05f..c73caf90701a2cb7d7714f048ec7792d60f114a2 100644
--- a/views/examples/example_base.cc
+++ b/views/examples/example_base.cc
@@ -54,19 +54,6 @@ class ContainerView : public View {
} // namespace
-namespace views {
-
-// OS_CHROMEOS requires a MenuWrapper::CreateWrapper implementation.
-// TODO(oshima): Fix chromium-os:7409 so that this isn't required.
-#if defined(OS_CHROMEOS)
-// static
-MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
- return new NativeMenuGtk(menu);
-}
-#endif // OS_CHROMEOS
-
-} // namespace views
-
namespace examples {
ExampleBase::ExampleBase(ExamplesMain* main)
« no previous file with comments | « views/controls/textfield/textfield_views_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698