OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/toolbar/wrench_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 #include "chrome/common/profiling.h" | 39 #include "chrome/common/profiling.h" |
40 #include "content/public/browser/host_zoom_map.h" | 40 #include "content/public/browser/host_zoom_map.h" |
41 #include "content/public/browser/notification_service.h" | 41 #include "content/public/browser/notification_service.h" |
42 #include "content/public/browser/notification_source.h" | 42 #include "content/public/browser/notification_source.h" |
43 #include "content/public/browser/notification_types.h" | 43 #include "content/public/browser/notification_types.h" |
44 #include "content/public/browser/user_metrics.h" | 44 #include "content/public/browser/user_metrics.h" |
45 #include "content/public/browser/web_contents.h" | 45 #include "content/public/browser/web_contents.h" |
46 #include "grit/chromium_strings.h" | 46 #include "grit/chromium_strings.h" |
47 #include "grit/generated_resources.h" | 47 #include "grit/generated_resources.h" |
48 #include "grit/theme_resources.h" | 48 #include "grit/theme_resources.h" |
| 49 #include "grit/theme_resources_standard.h" |
49 #include "ui/base/l10n/l10n_util.h" | 50 #include "ui/base/l10n/l10n_util.h" |
50 #include "ui/base/layout.h" | 51 #include "ui/base/layout.h" |
51 #include "ui/base/models/button_menu_item_model.h" | 52 #include "ui/base/models/button_menu_item_model.h" |
52 #include "ui/base/resource/resource_bundle.h" | 53 #include "ui/base/resource/resource_bundle.h" |
53 #include "ui/gfx/image/image.h" | 54 #include "ui/gfx/image/image.h" |
54 #include "ui/gfx/image/image_skia.h" | 55 #include "ui/gfx/image/image_skia.h" |
55 | 56 |
56 #if defined(TOOLKIT_GTK) | 57 #if defined(TOOLKIT_GTK) |
57 #include <gtk/gtk.h> | 58 #include <gtk/gtk.h> |
58 #include "chrome/browser/ui/gtk/gtk_util.h" | 59 #include "chrome/browser/ui/gtk/gtk_util.h" |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
613 zoom_label_ = l10n_util::GetStringFUTF16( | 614 zoom_label_ = l10n_util::GetStringFUTF16( |
614 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 615 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
615 } | 616 } |
616 | 617 |
617 string16 WrenchMenuModel::GetSyncMenuLabel() const { | 618 string16 WrenchMenuModel::GetSyncMenuLabel() const { |
618 Profile* profile = browser_->profile()->GetOriginalProfile(); | 619 Profile* profile = browser_->profile()->GetOriginalProfile(); |
619 return sync_ui_util::GetSyncMenuLabel( | 620 return sync_ui_util::GetSyncMenuLabel( |
620 ProfileSyncServiceFactory::GetForProfile(profile), | 621 ProfileSyncServiceFactory::GetForProfile(profile), |
621 *SigninManagerFactory::GetForProfile(profile)); | 622 *SigninManagerFactory::GetForProfile(profile)); |
622 } | 623 } |
OLD | NEW |