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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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>
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/themes/browser_theme_provider.h" 27 #include "chrome/browser/themes/browser_theme_provider.h"
28 #include "chrome/browser/ui/browser.h" 28 #include "chrome/browser/ui/browser.h"
29 #include "chrome/browser/ui/view_ids.h" 29 #include "chrome/browser/ui/view_ids.h"
30 #include "chrome/browser/ui/views/bookmark_context_menu.h" 30 #include "chrome/browser/ui/views/bookmark_context_menu.h"
31 #include "chrome/browser/ui/views/event_utils.h" 31 #include "chrome/browser/ui/views/event_utils.h"
32 #include "chrome/browser/ui/views/frame/browser_view.h" 32 #include "chrome/browser/ui/views/frame/browser_view.h"
33 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 33 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
34 #include "chrome/common/notification_service.h" 34 #include "chrome/common/notification_service.h"
35 #include "chrome/common/page_transition_types.h" 35 #include "chrome/common/page_transition_types.h"
36 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
37 #include "gfx/canvas_skia.h"
38 #include "grit/app_resources.h" 37 #include "grit/app_resources.h"
39 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
40 #include "grit/theme_resources.h" 39 #include "grit/theme_resources.h"
41 #include "ui/base/animation/slide_animation.h" 40 #include "ui/base/animation/slide_animation.h"
42 #include "ui/base/dragdrop/os_exchange_data.h" 41 #include "ui/base/dragdrop/os_exchange_data.h"
43 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
44 #include "ui/base/resource/resource_bundle.h" 43 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/base/text/text_elider.h" 44 #include "ui/base/text/text_elider.h"
45 #include "ui/gfx/canvas_skia.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
55 #if defined(OS_WIN) 55 #if defined(OS_WIN)
(...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 // The tooltip is the only way we have to display text explaining the error 1744 // The tooltip is the only way we have to display text explaining the error
1745 // to the user. 1745 // to the user.
1746 sync_error_button->SetTooltipText( 1746 sync_error_button->SetTooltipText(
1747 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC))); 1747 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)));
1748 sync_error_button->SetAccessibleName( 1748 sync_error_button->SetAccessibleName(
1749 l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON)); 1749 l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON));
1750 sync_error_button->SetIcon( 1750 sync_error_button->SetIcon(
1751 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); 1751 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
1752 return sync_error_button; 1752 return sync_error_button;
1753 } 1753 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/autofill_profiles_view_win.cc ('k') | chrome/browser/ui/views/bookmark_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698