| OLD | NEW | 
|---|
| 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 #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/gtk_dnd_util.h" | 9 #include "app/gtk_dnd_util.h" | 
| 10 #include "app/slide_animation.h" | 10 #include "app/slide_animation.h" | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
| 27 #include "chrome/browser/gtk/import_dialog_gtk.h" | 27 #include "chrome/browser/gtk/import_dialog_gtk.h" | 
| 28 #include "chrome/browser/gtk/menu_gtk.h" | 28 #include "chrome/browser/gtk/menu_gtk.h" | 
| 29 #include "chrome/browser/gtk/rounded_window.h" | 29 #include "chrome/browser/gtk/rounded_window.h" | 
| 30 #include "chrome/browser/gtk/tabstrip_origin_provider.h" | 30 #include "chrome/browser/gtk/tabstrip_origin_provider.h" | 
| 31 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" | 31 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" | 
| 32 #include "chrome/browser/gtk/view_id_util.h" | 32 #include "chrome/browser/gtk/view_id_util.h" | 
| 33 #include "chrome/browser/importer/importer_data_types.h" | 33 #include "chrome/browser/importer/importer_data_types.h" | 
| 34 #include "chrome/browser/metrics/user_metrics.h" | 34 #include "chrome/browser/metrics/user_metrics.h" | 
| 35 #include "chrome/browser/ntp_background_util.h" | 35 #include "chrome/browser/ntp_background_util.h" | 
| 36 #include "chrome/browser/prefs/pref_service.h" | 36 #include "chrome/browser/prefs/pref_service.h" | 
| 37 #include "chrome/browser/profile.h" | 37 #include "chrome/browser/profiles/profile.h" | 
| 38 #include "chrome/browser/sync/sync_ui_util.h" | 38 #include "chrome/browser/sync/sync_ui_util.h" | 
| 39 #include "chrome/browser/tab_contents/tab_contents.h" | 39 #include "chrome/browser/tab_contents/tab_contents.h" | 
| 40 #include "chrome/browser/tab_contents/tab_contents_view.h" | 40 #include "chrome/browser/tab_contents/tab_contents_view.h" | 
| 41 #include "chrome/browser/ui/browser.h" | 41 #include "chrome/browser/ui/browser.h" | 
| 42 #include "chrome/common/notification_service.h" | 42 #include "chrome/common/notification_service.h" | 
| 43 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" | 
| 44 #include "gfx/canvas_skia_paint.h" | 44 #include "gfx/canvas_skia_paint.h" | 
| 45 #include "gfx/gtk_util.h" | 45 #include "gfx/gtk_util.h" | 
| 46 #include "grit/app_resources.h" | 46 #include "grit/app_resources.h" | 
| 47 #include "grit/generated_resources.h" | 47 #include "grit/generated_resources.h" | 
| (...skipping 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1416 | 1416 | 
| 1417   // Find the GtkWidget* for the actual target button. | 1417   // Find the GtkWidget* for the actual target button. | 
| 1418   int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1; | 1418   int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1; | 
| 1419   button_idx = (button_idx + shift + folder_list.size()) % folder_list.size(); | 1419   button_idx = (button_idx + shift + folder_list.size()) % folder_list.size(); | 
| 1420   PopupForButton(folder_list[button_idx]); | 1420   PopupForButton(folder_list[button_idx]); | 
| 1421 } | 1421 } | 
| 1422 | 1422 | 
| 1423 void BookmarkBarGtk::CloseMenu() { | 1423 void BookmarkBarGtk::CloseMenu() { | 
| 1424   current_context_menu_->Cancel(); | 1424   current_context_menu_->Cancel(); | 
| 1425 } | 1425 } | 
| OLD | NEW | 
|---|