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

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

Issue 1253953002: Componentize enhanced_bookmark_features.{h,cc}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert change in //chrome/common/DEPS that broke checkdeps Created 5 years, 4 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/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 27 matching lines...) Expand all
38 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" 38 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
39 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 39 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
40 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 40 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
41 #include "chrome/browser/upgrade_detector.h" 41 #include "chrome/browser/upgrade_detector.h"
42 #include "chrome/common/chrome_paths.h" 42 #include "chrome/common/chrome_paths.h"
43 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
44 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
45 #include "chrome/common/profiling.h" 45 #include "chrome/common/profiling.h"
46 #include "chrome/grit/chromium_strings.h" 46 #include "chrome/grit/chromium_strings.h"
47 #include "chrome/grit/generated_resources.h" 47 #include "chrome/grit/generated_resources.h"
48 #include "components/dom_distiller/core/dom_distiller_switches.h"
48 #include "components/signin/core/browser/signin_manager.h" 49 #include "components/signin/core/browser/signin_manager.h"
49 #include "components/signin/core/common/profile_management_switches.h" 50 #include "components/signin/core/common/profile_management_switches.h"
50 #include "components/ui/zoom/zoom_controller.h" 51 #include "components/ui/zoom/zoom_controller.h"
51 #include "components/ui/zoom/zoom_event_manager.h" 52 #include "components/ui/zoom/zoom_event_manager.h"
52 #include "content/public/browser/host_zoom_map.h" 53 #include "content/public/browser/host_zoom_map.h"
53 #include "content/public/browser/navigation_entry.h" 54 #include "content/public/browser/navigation_entry.h"
54 #include "content/public/browser/notification_service.h" 55 #include "content/public/browser/notification_service.h"
55 #include "content/public/browser/notification_source.h" 56 #include "content/public/browser/notification_source.h"
56 #include "content/public/browser/notification_types.h" 57 #include "content/public/browser/notification_types.h"
57 #include "content/public/browser/user_metrics.h" 58 #include "content/public/browser/user_metrics.h"
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 ->GetZoomPercent(); 1096 ->GetZoomPercent();
1096 } 1097 }
1097 zoom_label_ = l10n_util::GetStringFUTF16( 1098 zoom_label_ = l10n_util::GetStringFUTF16(
1098 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 1099 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
1099 } 1100 }
1100 1101
1101 void WrenchMenuModel::OnZoomLevelChanged( 1102 void WrenchMenuModel::OnZoomLevelChanged(
1102 const content::HostZoomMap::ZoomLevelChange& change) { 1103 const content::HostZoomMap::ZoomLevelChange& change) {
1103 UpdateZoomControls(); 1104 UpdateZoomControls();
1104 } 1105 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_helpers.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698