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

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

Issue 9296041: Create Content API around HostZoomMap. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/views/wrench_menu.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) 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 #if defined(TOOLKIT_USES_GTK) 52 #if defined(TOOLKIT_USES_GTK)
53 #include <gtk/gtk.h> 53 #include <gtk/gtk.h>
54 #include "chrome/browser/ui/gtk/gtk_util.h" 54 #include "chrome/browser/ui/gtk/gtk_util.h"
55 #endif 55 #endif
56 56
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 #include "chrome/browser/enumerate_modules_model_win.h" 58 #include "chrome/browser/enumerate_modules_model_win.h"
59 #endif 59 #endif
60 60
61 using content::HostZoomMap;
61 using content::UserMetricsAction; 62 using content::UserMetricsAction;
62 using content::WebContents; 63 using content::WebContents;
63 64
64 //////////////////////////////////////////////////////////////////////////////// 65 ////////////////////////////////////////////////////////////////////////////////
65 // EncodingMenuModel 66 // EncodingMenuModel
66 67
67 EncodingMenuModel::EncodingMenuModel(Browser* browser) 68 EncodingMenuModel::EncodingMenuModel(Browser* browser)
68 : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), 69 : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
69 browser_(browser) { 70 browser_(browser) {
70 Build(); 71 Build();
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 &enable_increment, &enable_decrement); 592 &enable_increment, &enable_decrement);
592 } 593 }
593 zoom_label_ = l10n_util::GetStringFUTF16( 594 zoom_label_ = l10n_util::GetStringFUTF16(
594 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 595 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
595 } 596 }
596 597
597 string16 WrenchMenuModel::GetSyncMenuLabel() const { 598 string16 WrenchMenuModel::GetSyncMenuLabel() const {
598 return sync_ui_util::GetSyncMenuLabel(ProfileSyncServiceFactory:: 599 return sync_ui_util::GetSyncMenuLabel(ProfileSyncServiceFactory::
599 GetInstance()->GetForProfile(browser_->profile()->GetOriginalProfile())); 600 GetInstance()->GetForProfile(browser_->profile()->GetOriginalProfile()));
600 } 601 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/views/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698