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

Unified Diff: chrome/browser/ui/toolbar/bookmark_sub_menu_model.h

Issue 9969080: Remove TOOLKIT_USES_GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add gtk dependency to android linux host Created 8 years, 9 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 | « chrome/browser/ui/tests/ui_gfx_image_unittest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
diff --git a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
index 5223ff507e890606ab4af637f94058f691836bed..efe83e6b6e1e86ba7daa9a1ecd707e6c9a13dad7 100644
--- a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
@@ -12,11 +12,11 @@
// For the time being on GTK systems, we have a dedicated bookmark menu model in
// chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.h instead.
-#if defined(TOOLKIT_USES_GTK) && !defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_GTK)
#include "chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h"
-#else // defined(TOOLKIT_USES_GTK) && !defined(TOOLKIT_VIEWS)
+#else // defined(TOOLKIT_GTK)
#include "ui/base/models/simple_menu_model.h"
@@ -34,6 +34,6 @@ class BookmarkSubMenuModel : public ui::SimpleMenuModel {
DISALLOW_COPY_AND_ASSIGN(BookmarkSubMenuModel);
};
-#endif // defined(TOOLKIT_USES_GTK) && !defined(TOOLKIT_VIEWS)
+#endif // defined(TOOLKIT_GTK)
#endif // CHROME_BROWSER_UI_TOOLBAR_BOOKMARK_SUB_MENU_MODEL_H_
« no previous file with comments | « chrome/browser/ui/tests/ui_gfx_image_unittest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698