| 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/views/bookmark_bar_view.h" | 5 #include "chrome/browser/views/bookmark_bar_view.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <limits> | 8 #include <limits> | 
| 9 #include <set> | 9 #include <set> | 
| 10 #include <vector> | 10 #include <vector> | 
| 11 | 11 | 
| 12 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" | 
| 13 #include "app/os_exchange_data.h" | 13 #include "app/os_exchange_data.h" | 
| 14 #include "app/resource_bundle.h" | 14 #include "app/resource_bundle.h" | 
| 15 #include "app/slide_animation.h" | 15 #include "app/slide_animation.h" | 
| 16 #include "app/text_elider.h" | 16 #include "app/text_elider.h" | 
| 17 #include "base/i18n/rtl.h" | 17 #include "base/i18n/rtl.h" | 
| 18 #include "base/string_util.h" | 18 #include "base/string_util.h" | 
| 19 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" | 
| 20 #include "chrome/browser/bookmarks/bookmark_model.h" | 20 #include "chrome/browser/bookmarks/bookmark_model.h" | 
| 21 #include "chrome/browser/bookmarks/bookmark_utils.h" | 21 #include "chrome/browser/bookmarks/bookmark_utils.h" | 
| 22 #include "chrome/browser/browser_shutdown.h" | 22 #include "chrome/browser/browser_shutdown.h" | 
| 23 #include "chrome/browser/browser_thread.h" |  | 
| 24 #include "chrome/browser/importer/importer_data_types.h" | 23 #include "chrome/browser/importer/importer_data_types.h" | 
| 25 #include "chrome/browser/metrics/user_metrics.h" | 24 #include "chrome/browser/metrics/user_metrics.h" | 
| 26 #include "chrome/browser/prefs/pref_service.h" | 25 #include "chrome/browser/prefs/pref_service.h" | 
| 27 #include "chrome/browser/profiles/profile.h" | 26 #include "chrome/browser/profiles/profile.h" | 
| 28 #include "chrome/browser/renderer_host/render_view_host.h" | 27 #include "chrome/browser/renderer_host/render_view_host.h" | 
| 29 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 28 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 
| 30 #include "chrome/browser/sync/sync_ui_util.h" | 29 #include "chrome/browser/sync/sync_ui_util.h" | 
| 31 #include "chrome/browser/tab_contents/page_navigator.h" | 30 #include "chrome/browser/tab_contents/page_navigator.h" | 
| 32 #include "chrome/browser/tab_contents/tab_contents.h" | 31 #include "chrome/browser/tab_contents/tab_contents.h" | 
| 33 #include "chrome/browser/themes/browser_theme_provider.h" | 32 #include "chrome/browser/themes/browser_theme_provider.h" | 
| (...skipping 1699 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1733   // The tooltip is the only way we have to display text explaining the error | 1732   // The tooltip is the only way we have to display text explaining the error | 
| 1734   // to the user. | 1733   // to the user. | 
| 1735   sync_error_button->SetTooltipText( | 1734   sync_error_button->SetTooltipText( | 
| 1736       l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)); | 1735       l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)); | 
| 1737   sync_error_button->SetAccessibleName( | 1736   sync_error_button->SetAccessibleName( | 
| 1738       l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON)); | 1737       l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON)); | 
| 1739   sync_error_button->SetIcon( | 1738   sync_error_button->SetIcon( | 
| 1740       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); | 1739       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); | 
| 1741   return sync_error_button; | 1740   return sync_error_button; | 
| 1742 } | 1741 } | 
| OLD | NEW | 
|---|