OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include "chrome/browser/gtk/bookmark_bar_gtk.h" | 5 #include "chrome/browser/gtk/bookmark_bar_gtk.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
| 9 #include "app/gfx/gtk_util.h" |
9 #include "app/gfx/text_elider.h" | 10 #include "app/gfx/text_elider.h" |
10 #include "app/gtk_dnd_util.h" | 11 #include "app/gtk_dnd_util.h" |
11 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
12 #include "app/resource_bundle.h" | 13 #include "app/resource_bundle.h" |
13 #include "base/gfx/gtk_util.h" | |
14 #include "base/pickle.h" | 14 #include "base/pickle.h" |
15 #include "chrome/browser/bookmarks/bookmark_drag_data.h" | 15 #include "chrome/browser/bookmarks/bookmark_drag_data.h" |
16 #include "chrome/browser/bookmarks/bookmark_model.h" | 16 #include "chrome/browser/bookmarks/bookmark_model.h" |
17 #include "chrome/browser/bookmarks/bookmark_utils.h" | 17 #include "chrome/browser/bookmarks/bookmark_utils.h" |
18 #include "chrome/browser/browser.h" | 18 #include "chrome/browser/browser.h" |
19 #include "chrome/browser/gtk/bookmark_context_menu.h" | 19 #include "chrome/browser/gtk/bookmark_context_menu.h" |
20 #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h" | 20 #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h" |
21 #include "chrome/browser/gtk/bookmark_tree_model.h" | 21 #include "chrome/browser/gtk/bookmark_tree_model.h" |
22 #include "chrome/browser/gtk/bookmark_utils_gtk.h" | 22 #include "chrome/browser/gtk/bookmark_utils_gtk.h" |
23 #include "chrome/browser/gtk/browser_window_gtk.h" | 23 #include "chrome/browser/gtk/browser_window_gtk.h" |
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1176 break; | 1176 break; |
1177 } | 1177 } |
1178 } | 1178 } |
1179 DCHECK_NE(button_idx, -1); | 1179 DCHECK_NE(button_idx, -1); |
1180 | 1180 |
1181 // Find the GtkWidget* for the actual target button. | 1181 // Find the GtkWidget* for the actual target button. |
1182 int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1; | 1182 int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1; |
1183 button_idx = (button_idx + shift + folder_list.size()) % folder_list.size(); | 1183 button_idx = (button_idx + shift + folder_list.size()) % folder_list.size(); |
1184 PopupForButton(folder_list[button_idx]); | 1184 PopupForButton(folder_list[button_idx]); |
1185 } | 1185 } |
OLD | NEW |