summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 23:20:14 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 23:20:14 +0000
commit40d59ce5843802c4bc5fa667890334cbc040252e (patch)
treed51a5db86d9aa9efdd47fa2fbfa2e78e6bb1859f /chrome/browser/tab_contents
parentd5dbf9d9ccad36a514e89b49f7644252a3fa7682 (diff)
downloadchromium_src-40d59ce5843802c4bc5fa667890334cbc040252e.zip
chromium_src-40d59ce5843802c4bc5fa667890334cbc040252e.tar.gz
chromium_src-40d59ce5843802c4bc5fa667890334cbc040252e.tar.bz2
Enable the character encoding menu, zoom menu, and the help menu item.
The character encoding menu is still broken in that it doesn't load the encoding names (sub-menu items), but auto detect might work. Review URL: http://codereview.chromium.org/39286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/web_contents.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 55c3180..affa867 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/autofill_manager.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/character_encoding.h"
#include "chrome/browser/dom_operation_notification_details.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/gears_integration.h"
@@ -46,7 +47,6 @@
#if defined(OS_WIN)
// TODO(port): fill these in as we flesh out the implementation of this class
#include "chrome/browser/cache_manager_host.h"
-#include "chrome/browser/character_encoding.h"
#include "chrome/browser/download/download_request_manager.h"
#include "chrome/browser/modal_html_dialog_delegate.h"
#include "chrome/browser/plugin_service.h"