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

Side by Side Diff: chrome/browser/ui/toolbar/app_menu_model.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
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/app_menu_model.h" 5 #include "chrome/browser/ui/toolbar/app_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"
11 #include "base/debug/debugging_flags.h" 11 #include "base/debug/debugging_flags.h"
12 #include "base/debug/profiler.h" 12 #include "base/debug/profiler.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/prefs/pref_service.h"
16 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
19 #include "build/build_config.h" 18 #include "build/build_config.h"
20 #include "chrome/app/chrome_command_ids.h" 19 #include "chrome/app/chrome_command_ids.h"
21 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/defaults.h" 21 #include "chrome/browser/defaults.h"
23 #include "chrome/browser/extensions/extension_util.h" 22 #include "chrome/browser/extensions/extension_util.h"
24 #include "chrome/browser/media/router/media_router_feature.h" 23 #include "chrome/browser/media/router/media_router_feature.h"
25 #include "chrome/browser/prefs/incognito_mode_prefs.h" 24 #include "chrome/browser/prefs/incognito_mode_prefs.h"
(...skipping 17 matching lines...) Expand all
43 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 42 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
44 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 43 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
45 #include "chrome/browser/upgrade_detector.h" 44 #include "chrome/browser/upgrade_detector.h"
46 #include "chrome/common/chrome_paths.h" 45 #include "chrome/common/chrome_paths.h"
47 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
48 #include "chrome/common/profiling.h" 47 #include "chrome/common/profiling.h"
49 #include "chrome/grit/chromium_strings.h" 48 #include "chrome/grit/chromium_strings.h"
50 #include "chrome/grit/generated_resources.h" 49 #include "chrome/grit/generated_resources.h"
51 #include "components/bookmarks/common/bookmark_pref_names.h" 50 #include "components/bookmarks/common/bookmark_pref_names.h"
52 #include "components/dom_distiller/core/dom_distiller_switches.h" 51 #include "components/dom_distiller/core/dom_distiller_switches.h"
52 #include "components/prefs/pref_service.h"
53 #include "components/signin/core/browser/signin_manager.h" 53 #include "components/signin/core/browser/signin_manager.h"
54 #include "components/signin/core/common/profile_management_switches.h" 54 #include "components/signin/core/common/profile_management_switches.h"
55 #include "components/ui/zoom/zoom_controller.h" 55 #include "components/ui/zoom/zoom_controller.h"
56 #include "components/ui/zoom/zoom_event_manager.h" 56 #include "components/ui/zoom/zoom_event_manager.h"
57 #include "content/public/browser/host_zoom_map.h" 57 #include "content/public/browser/host_zoom_map.h"
58 #include "content/public/browser/navigation_entry.h" 58 #include "content/public/browser/navigation_entry.h"
59 #include "content/public/browser/notification_service.h" 59 #include "content/public/browser/notification_service.h"
60 #include "content/public/browser/notification_source.h" 60 #include "content/public/browser/notification_source.h"
61 #include "content/public/browser/notification_types.h" 61 #include "content/public/browser/notification_types.h"
62 #include "content/public/browser/user_metrics.h" 62 #include "content/public/browser/user_metrics.h"
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 ->GetZoomPercent(); 943 ->GetZoomPercent();
944 } 944 }
945 zoom_label_ = l10n_util::GetStringFUTF16( 945 zoom_label_ = l10n_util::GetStringFUTF16(
946 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 946 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
947 } 947 }
948 948
949 void AppMenuModel::OnZoomLevelChanged( 949 void AppMenuModel::OnZoomLevelChanged(
950 const content::HostZoomMap::ZoomLevelChange& change) { 950 const content::HostZoomMap::ZoomLevelChange& change) {
951 UpdateZoomControls(); 951 UpdateZoomControls();
952 } 952 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/task_manager/task_manager_table_model.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698