| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_GTK_MENU_GTK_H_ | 5 #ifndef CHROME_BROWSER_UI_GTK_MENU_GTK_H_ |
| 6 #define CHROME_BROWSER_GTK_MENU_GTK_H_ | 6 #define CHROME_BROWSER_UI_GTK_MENU_GTK_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
| 10 | 10 |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "app/gtk_signal.h" | 14 #include "app/gtk_signal.h" |
| 15 #include "base/task.h" | 15 #include "base/task.h" |
| 16 #include "gfx/point.h" | 16 #include "gfx/point.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 // menu items from getting activated when we are setting up the | 189 // menu items from getting activated when we are setting up the |
| 190 // menu. | 190 // menu. |
| 191 static bool block_activation_; | 191 static bool block_activation_; |
| 192 | 192 |
| 193 // We must free these at shutdown. | 193 // We must free these at shutdown. |
| 194 std::vector<MenuGtk*> submenus_we_own_; | 194 std::vector<MenuGtk*> submenus_we_own_; |
| 195 | 195 |
| 196 ScopedRunnableMethodFactory<MenuGtk> factory_; | 196 ScopedRunnableMethodFactory<MenuGtk> factory_; |
| 197 }; | 197 }; |
| 198 | 198 |
| 199 #endif // CHROME_BROWSER_GTK_MENU_GTK_H_ | 199 #endif // CHROME_BROWSER_UI_GTK_MENU_GTK_H_ |
| OLD | NEW |