| 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 30 matching lines...) Expand all Loading... |
| 41 #include "chrome/common/profiling.h" | 41 #include "chrome/common/profiling.h" |
| 42 #include "content/public/browser/host_zoom_map.h" | 42 #include "content/public/browser/host_zoom_map.h" |
| 43 #include "content/public/browser/notification_service.h" | 43 #include "content/public/browser/notification_service.h" |
| 44 #include "content/public/browser/notification_source.h" | 44 #include "content/public/browser/notification_source.h" |
| 45 #include "content/public/browser/notification_types.h" | 45 #include "content/public/browser/notification_types.h" |
| 46 #include "content/public/browser/user_metrics.h" | 46 #include "content/public/browser/user_metrics.h" |
| 47 #include "content/public/browser/web_contents.h" | 47 #include "content/public/browser/web_contents.h" |
| 48 #include "grit/chromium_strings.h" | 48 #include "grit/chromium_strings.h" |
| 49 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
| 50 #include "grit/theme_resources.h" | 50 #include "grit/theme_resources.h" |
| 51 #include "grit/theme_resources_standard.h" | |
| 52 #include "ui/base/l10n/l10n_util.h" | 51 #include "ui/base/l10n/l10n_util.h" |
| 53 #include "ui/base/layout.h" | 52 #include "ui/base/layout.h" |
| 54 #include "ui/base/models/button_menu_item_model.h" | 53 #include "ui/base/models/button_menu_item_model.h" |
| 55 #include "ui/base/resource/resource_bundle.h" | 54 #include "ui/base/resource/resource_bundle.h" |
| 56 #include "ui/gfx/image/image.h" | 55 #include "ui/gfx/image/image.h" |
| 57 #include "ui/gfx/image/image_skia.h" | 56 #include "ui/gfx/image/image_skia.h" |
| 58 | 57 |
| 59 #if defined(TOOLKIT_GTK) | 58 #if defined(TOOLKIT_GTK) |
| 60 #include <gtk/gtk.h> | 59 #include <gtk/gtk.h> |
| 61 #include "chrome/browser/ui/gtk/gtk_util.h" | 60 #include "chrome/browser/ui/gtk/gtk_util.h" |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 zoom_label_ = l10n_util::GetStringFUTF16( | 627 zoom_label_ = l10n_util::GetStringFUTF16( |
| 629 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 628 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
| 630 } | 629 } |
| 631 | 630 |
| 632 string16 WrenchMenuModel::GetSyncMenuLabel() const { | 631 string16 WrenchMenuModel::GetSyncMenuLabel() const { |
| 633 Profile* profile = browser_->profile()->GetOriginalProfile(); | 632 Profile* profile = browser_->profile()->GetOriginalProfile(); |
| 634 return sync_ui_util::GetSyncMenuLabel( | 633 return sync_ui_util::GetSyncMenuLabel( |
| 635 ProfileSyncServiceFactory::GetForProfile(profile), | 634 ProfileSyncServiceFactory::GetForProfile(profile), |
| 636 *SigninManagerFactory::GetForProfile(profile)); | 635 *SigninManagerFactory::GetForProfile(profile)); |
| 637 } | 636 } |
| OLD | NEW |