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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/views/bookmark_bar_view.h" 5 #include "chrome/browser/ui/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/resource_bundle.h"
14 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
15 #include "base/string_util.h" 14 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/bookmarks/bookmark_model.h" 16 #include "chrome/browser/bookmarks/bookmark_model.h"
18 #include "chrome/browser/bookmarks/bookmark_utils.h" 17 #include "chrome/browser/bookmarks/bookmark_utils.h"
19 #include "chrome/browser/browser_shutdown.h" 18 #include "chrome/browser/browser_shutdown.h"
20 #include "chrome/browser/importer/importer_data_types.h" 19 #include "chrome/browser/importer/importer_data_types.h"
21 #include "chrome/browser/metrics/user_metrics.h" 20 #include "chrome/browser/metrics/user_metrics.h"
22 #include "chrome/browser/prefs/pref_service.h" 21 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
(...skipping 11 matching lines...) Expand all
35 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 34 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
36 #include "chrome/common/notification_service.h" 35 #include "chrome/common/notification_service.h"
37 #include "chrome/common/page_transition_types.h" 36 #include "chrome/common/page_transition_types.h"
38 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
39 #include "gfx/canvas_skia.h" 38 #include "gfx/canvas_skia.h"
40 #include "grit/app_resources.h" 39 #include "grit/app_resources.h"
41 #include "grit/generated_resources.h" 40 #include "grit/generated_resources.h"
42 #include "grit/theme_resources.h" 41 #include "grit/theme_resources.h"
43 #include "ui/base/animation/slide_animation.h" 42 #include "ui/base/animation/slide_animation.h"
44 #include "ui/base/dragdrop/os_exchange_data.h" 43 #include "ui/base/dragdrop/os_exchange_data.h"
44 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/base/text/text_elider.h" 45 #include "ui/base/text/text_elider.h"
46 #include "views/controls/button/menu_button.h" 46 #include "views/controls/button/menu_button.h"
47 #include "views/controls/label.h" 47 #include "views/controls/label.h"
48 #include "views/controls/menu/menu_item_view.h" 48 #include "views/controls/menu/menu_item_view.h"
49 #include "views/drag_utils.h" 49 #include "views/drag_utils.h"
50 #include "views/view_constants.h" 50 #include "views/view_constants.h"
51 #include "views/widget/tooltip_manager.h" 51 #include "views/widget/tooltip_manager.h"
52 #include "views/widget/widget.h" 52 #include "views/widget/widget.h"
53 #include "views/window/window.h" 53 #include "views/window/window.h"
54 54
(...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after
1734 // The tooltip is the only way we have to display text explaining the error 1734 // The tooltip is the only way we have to display text explaining the error
1735 // to the user. 1735 // to the user.
1736 sync_error_button->SetTooltipText( 1736 sync_error_button->SetTooltipText(
1737 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC))); 1737 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)));
1738 sync_error_button->SetAccessibleName( 1738 sync_error_button->SetAccessibleName(
1739 l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON)); 1739 l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON));
1740 sync_error_button->SetIcon( 1740 sync_error_button->SetIcon(
1741 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); 1741 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
1742 return sync_error_button; 1742 return sync_error_button;
1743 } 1743 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/autofill_profiles_view_win.cc ('k') | chrome/browser/ui/views/bookmark_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698