summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/toolbar
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 22:19:42 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 22:19:42 +0000
commit35d06150b498cd3f301ad26a3e979cdcbbd4c541 (patch)
tree62a32c216be4f2c943c1a329c0be44af8b122064 /chrome/browser/ui/toolbar
parent4859b837fbb012c8f1976f98d29f2fdd15cd8c15 (diff)
downloadchromium_src-35d06150b498cd3f301ad26a3e979cdcbbd4c541.zip
chromium_src-35d06150b498cd3f301ad26a3e979cdcbbd4c541.tar.gz
chromium_src-35d06150b498cd3f301ad26a3e979cdcbbd4c541.tar.bz2
Refactored the screenshot mechanism.
Added a new method to browser window to get a screenshot in a platform independent way. Changed user feedback UI code to use the new method. BUG=65119 TEST=Tested with sending feedback with the new code. Screenshots are being taken and sent correctly. Review URL: http://codereview.chromium.org/6145001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/toolbar')
-rw-r--r--chrome/browser/ui/toolbar/wrench_menu_model.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index a68922f..e45db37 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -171,10 +171,10 @@ void ToolsMenuModel::Build(Browser* browser) {
AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
AddSeparator();
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
+
AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
+
AddSeparator();
-#endif
encoding_menu_model_.reset(new EncodingMenuModel(browser));
AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,