chrome/browser/ui/views/toolbar_view.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

Side by Side Diff: chrome/browser/ui/views/toolbar_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

« no previous file with comments | « chrome/browser/ui/views/theme_install_bubble_view.cc ('k') | chrome/browser/ui/views/update_recommended_message_box.h » ('j') | no next file with comments »

OLD	NEW
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/toolbar_view.h"	5 #include "chrome/browser/ui/views/toolbar_view.h"

6	6

7 #include "base/i18n/number_formatting.h"	7 #include "base/i18n/number_formatting.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/app/chrome_command_ids.h"	9 #include "chrome/app/chrome_command_ids.h"

10 #include "chrome/browser/accessibility/browser_accessibility_state.h"	10 #include "chrome/browser/accessibility/browser_accessibility_state.h"

11 #include "chrome/browser/background_page_tracker.h"	11 #include "chrome/browser/background_page_tracker.h"

12 #include "chrome/browser/metrics/user_metrics.h"	12 #include "chrome/browser/metrics/user_metrics.h"

13 #include "chrome/browser/prefs/pref_service.h"	13 #include "chrome/browser/prefs/pref_service.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/themes/browser_theme_provider.h"	15 #include "chrome/browser/themes/browser_theme_provider.h"

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_window.h"	17 #include "chrome/browser/ui/browser_window.h"

18 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	18 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

19 #include "chrome/browser/ui/view_ids.h"	19 #include "chrome/browser/ui/view_ids.h"

20 #include "chrome/browser/ui/views/browser_actions_container.h"	20 #include "chrome/browser/ui/views/browser_actions_container.h"

21 #include "chrome/browser/ui/views/event_utils.h"	21 #include "chrome/browser/ui/views/event_utils.h"

22 #include "chrome/browser/ui/views/frame/browser_view.h"	22 #include "chrome/browser/ui/views/frame/browser_view.h"

23 #include "chrome/browser/upgrade_detector.h"	23 #include "chrome/browser/upgrade_detector.h"

24 #include "chrome/common/notification_service.h"	24 #include "chrome/common/notification_service.h"

25 #include "chrome/common/pref_names.h"	25 #include "chrome/common/pref_names.h"

26 #include "gfx/canvas.h"

27 #include "gfx/canvas_skia.h"

28 #include "gfx/skbitmap_operations.h"

29 #include "grit/chromium_strings.h"	26 #include "grit/chromium_strings.h"

30 #include "grit/generated_resources.h"	27 #include "grit/generated_resources.h"

31 #include "grit/theme_resources.h"	28 #include "grit/theme_resources.h"

32 #include "ui/base/l10n/l10n_util.h"	29 #include "ui/base/l10n/l10n_util.h"

33 #include "ui/base/resource/resource_bundle.h"	30 #include "ui/base/resource/resource_bundle.h"

	31 #include "ui/gfx/canvas.h"

	32 #include "ui/gfx/canvas_skia.h"

	33 #include "ui/gfx/skbitmap_operations.h"

34 #include "views/controls/button/button_dropdown.h"	34 #include "views/controls/button/button_dropdown.h"

35 #include "views/focus/view_storage.h"	35 #include "views/focus/view_storage.h"

36 #include "views/widget/tooltip_manager.h"	36 #include "views/widget/tooltip_manager.h"

37 #include "views/window/non_client_view.h"	37 #include "views/window/non_client_view.h"

38 #include "views/window/window.h"	38 #include "views/window/window.h"

39	39

40 #if defined(OS_CHROMEOS)	40 #if defined(OS_CHROMEOS)

41 #include "chrome/browser/chromeos/cros/cros_library.h"	41 #include "chrome/browser/chromeos/cros/cros_library.h"

42 #include "chrome/browser/chromeos/cros/update_library.h"	42 #include "chrome/browser/chromeos/cros/update_library.h"

43 #include "chrome/browser/chromeos/dom_ui/wrench_menu_ui.h"	43 #include "chrome/browser/chromeos/dom_ui/wrench_menu_ui.h"

(...skipping 722 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
766 NOTREACHED();	766 NOTREACHED();

767 #endif	767 #endif

768 } else {	768 } else {

769 NOTREACHED();	769 NOTREACHED();

770 }	770 }

771	771

772 canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);	772 canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);

773	773

774 return canvas->ExtractBitmap();	774 return canvas->ExtractBitmap();

775 }	775 }

OLD	NEW