Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: chrome/browser/ui/views/bookmark_bar_view.cc

Issue 5046002: Cleanup: Include browser.h -> ui/browser.h [Part 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser_list.h ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/text_elider.h" 15 #include "app/text_elider.h"
16 #include "base/i18n/rtl.h" 16 #include "base/i18n/rtl.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
19 #include "chrome/browser/bookmarks/bookmark_model.h" 19 #include "chrome/browser/bookmarks/bookmark_model.h"
20 #include "chrome/browser/bookmarks/bookmark_utils.h" 20 #include "chrome/browser/bookmarks/bookmark_utils.h"
21 #include "chrome/browser/browser.h"
22 #include "chrome/browser/browser_shutdown.h" 21 #include "chrome/browser/browser_shutdown.h"
23 #include "chrome/browser/browser_thread.h" 22 #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/profile.h" 26 #include "chrome/browser/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"
33 #include "chrome/browser/ui/browser.h"
34 #include "chrome/browser/view_ids.h" 34 #include "chrome/browser/view_ids.h"
35 #include "chrome/browser/views/bookmark_context_menu.h" 35 #include "chrome/browser/views/bookmark_context_menu.h"
36 #include "chrome/browser/views/event_utils.h" 36 #include "chrome/browser/views/event_utils.h"
37 #include "chrome/browser/views/frame/browser_view.h" 37 #include "chrome/browser/views/frame/browser_view.h"
38 #include "chrome/browser/views/location_bar/location_bar_view.h" 38 #include "chrome/browser/views/location_bar/location_bar_view.h"
39 #include "chrome/common/notification_service.h" 39 #include "chrome/common/notification_service.h"
40 #include "chrome/common/page_transition_types.h" 40 #include "chrome/common/page_transition_types.h"
41 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
42 #include "gfx/canvas_skia.h" 42 #include "gfx/canvas_skia.h"
43 #include "grit/app_resources.h" 43 #include "grit/app_resources.h"
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after
1725 // The tooltip is the only way we have to display text explaining the error 1725 // The tooltip is the only way we have to display text explaining the error
1726 // to the user. 1726 // to the user.
1727 sync_error_button->SetTooltipText( 1727 sync_error_button->SetTooltipText(
1728 l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)); 1728 l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC));
1729 sync_error_button->SetAccessibleName( 1729 sync_error_button->SetAccessibleName(
1730 l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON)); 1730 l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON));
1731 sync_error_button->SetIcon( 1731 sync_error_button->SetIcon(
1732 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); 1732 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
1733 return sync_error_button; 1733 return sync_error_button;
1734 } 1734 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_list.h ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698