| 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/metrics/user_metrics.h" | 11 #include "chrome/browser/metrics/user_metrics.h" | 
| 12 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" | 
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" | 
| 14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" | 
| 15 #include "chrome/browser/ui/browser_window.h" | 15 #include "chrome/browser/ui/browser_window.h" | 
| 16 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 16 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 
| 17 #include "chrome/browser/ui/view_ids.h" | 17 #include "chrome/browser/ui/view_ids.h" | 
| 18 #include "chrome/browser/ui/views/browser_actions_container.h" | 18 #include "chrome/browser/ui/views/browser_actions_container.h" | 
| 19 #include "chrome/browser/ui/views/event_utils.h" | 19 #include "chrome/browser/ui/views/event_utils.h" | 
| 20 #include "chrome/browser/upgrade_detector.h" | 20 #include "chrome/browser/upgrade_detector.h" | 
| 21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" | 
| 22 #include "content/common/notification_service.h" | 22 #include "content/common/notification_service.h" | 
| 23 #include "grit/chromium_strings.h" | 23 #include "grit/chromium_strings.h" | 
| 24 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" | 
| 25 #include "grit/theme_resources.h" | 25 #include "grit/theme_resources.h" | 
|  | 26 #include "grit/theme_resources_standard.h" | 
| 26 #include "ui/base/accessibility/accessible_view_state.h" | 27 #include "ui/base/accessibility/accessible_view_state.h" | 
| 27 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" | 
| 28 #include "ui/base/resource/resource_bundle.h" | 29 #include "ui/base/resource/resource_bundle.h" | 
| 29 #include "ui/base/theme_provider.h" | 30 #include "ui/base/theme_provider.h" | 
| 30 #include "ui/gfx/canvas.h" | 31 #include "ui/gfx/canvas.h" | 
| 31 #include "ui/gfx/canvas_skia.h" | 32 #include "ui/gfx/canvas_skia.h" | 
| 32 #include "ui/gfx/skbitmap_operations.h" | 33 #include "ui/gfx/skbitmap_operations.h" | 
| 33 #include "views/controls/button/button_dropdown.h" | 34 #include "views/controls/button/button_dropdown.h" | 
| 34 #include "views/focus/view_storage.h" | 35 #include "views/focus/view_storage.h" | 
| 35 #include "views/widget/tooltip_manager.h" | 36 #include "views/widget/tooltip_manager.h" | 
| (...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 761     NOTREACHED(); | 762     NOTREACHED(); | 
| 762 #endif | 763 #endif | 
| 763   } else { | 764   } else { | 
| 764     NOTREACHED(); | 765     NOTREACHED(); | 
| 765   } | 766   } | 
| 766 | 767 | 
| 767   canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin); | 768   canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin); | 
| 768 | 769 | 
| 769   return canvas->ExtractBitmap(); | 770   return canvas->ExtractBitmap(); | 
| 770 } | 771 } | 
| OLD | NEW | 
|---|