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

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

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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/tabs/tab_strip.cc ('k') | chrome/browser/unload_uitest.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/toolbar_view.h" 5 #include "chrome/browser/views/toolbar_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/i18n/number_formatting.h" 9 #include "base/i18n/number_formatting.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/accessibility/browser_accessibility_state.h" 11 #include "chrome/browser/accessibility/browser_accessibility_state.h"
12 #include "chrome/browser/background_page_tracker.h" 12 #include "chrome/browser/background_page_tracker.h"
13 #include "chrome/browser/prefs/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/browser/profile.h" 14 #include "chrome/browser/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/views/browser_actions_container.h" 20 #include "chrome/browser/ui/views/browser_actions_container.h"
20 #include "chrome/browser/ui/views/event_utils.h" 21 #include "chrome/browser/ui/views/event_utils.h"
21 #include "chrome/browser/ui/views/frame/browser_view.h" 22 #include "chrome/browser/ui/views/frame/browser_view.h"
22 #include "chrome/browser/upgrade_detector.h" 23 #include "chrome/browser/upgrade_detector.h"
23 #include "chrome/browser/view_ids.h"
24 #include "chrome/common/badge_util.h" 24 #include "chrome/common/badge_util.h"
25 #include "chrome/common/notification_service.h" 25 #include "chrome/common/notification_service.h"
26 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
27 #include "gfx/canvas.h" 27 #include "gfx/canvas.h"
28 #include "gfx/canvas_skia.h" 28 #include "gfx/canvas_skia.h"
29 #include "gfx/skbitmap_operations.h" 29 #include "gfx/skbitmap_operations.h"
30 #include "grit/chromium_strings.h" 30 #include "grit/chromium_strings.h"
31 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
32 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.h"
33 #include "views/controls/button/button_dropdown.h" 33 #include "views/controls/button/button_dropdown.h"
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 SkBitmap* badge = tp->GetBitmapNamed(IDR_BACKGROUND_BADGE); 762 SkBitmap* badge = tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
763 string16 badge_text = base::FormatNumber( 763 string16 badge_text = base::FormatNumber(
764 BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount()); 764 BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
765 return badge_util::DrawBadgeIconOverlay( 765 return badge_util::DrawBadgeIconOverlay(
766 *badge, 766 *badge,
767 kBadgeTextFontSize, 767 kBadgeTextFontSize,
768 badge_text, 768 badge_text,
769 l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW)); 769 l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW));
770 } 770 }
771 771
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/unload_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698