| 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 "app/l10n_util.h" |
| 7 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 8 #include "base/gfx/gtk_util.h" | 9 #include "base/gfx/gtk_util.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_context_menu.h" | 10 #include "chrome/browser/bookmarks/bookmark_context_menu.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 11 #include "chrome/browser/browser.h" | 12 #include "chrome/browser/browser.h" |
| 12 #include "chrome/browser/gtk/custom_button.h" | 13 #include "chrome/browser/gtk/custom_button.h" |
| 13 #include "chrome/browser/gtk/gtk_chrome_button.h" | 14 #include "chrome/browser/gtk/gtk_chrome_button.h" |
| 14 #include "chrome/browser/metrics/user_metrics.h" | 15 #include "chrome/browser/metrics/user_metrics.h" |
| 15 #include "chrome/browser/profile.h" | 16 #include "chrome/browser/profile.h" |
| 16 #include "chrome/common/gfx/text_elider.h" | 17 #include "chrome/common/gfx/text_elider.h" |
| 17 #include "chrome/common/gtk_util.h" | 18 #include "chrome/common/gtk_util.h" |
| 18 #include "chrome/common/l10n_util.h" | |
| 19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
| 20 #include "chrome/common/pref_service.h" | 20 #include "chrome/common/pref_service.h" |
| 21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 22 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xe6, 0xed, 0xf4); | 26 const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xe6, 0xed, 0xf4); |
| 27 | 27 |
| 28 // Padding around the container. | 28 // Padding around the container. |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 if (bar->dragged_node_) { | 606 if (bar->dragged_node_) { |
| 607 gint index = gtk_toolbar_get_drop_index(GTK_TOOLBAR(toolbar), x, y); | 607 gint index = gtk_toolbar_get_drop_index(GTK_TOOLBAR(toolbar), x, y); |
| 608 // Drag from same profile, do a move. | 608 // Drag from same profile, do a move. |
| 609 bar->model_->Move(bar->dragged_node_, bar->model_->GetBookmarkBarNode(), | 609 bar->model_->Move(bar->dragged_node_, bar->model_->GetBookmarkBarNode(), |
| 610 index); | 610 index); |
| 611 return TRUE; | 611 return TRUE; |
| 612 } | 612 } |
| 613 | 613 |
| 614 return FALSE; | 614 return FALSE; |
| 615 } | 615 } |
| OLD | NEW |