summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authormhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 02:02:39 +0000
committermhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 02:02:39 +0000
commit8819206f48b04c853ab9a05e6cf3161370780b19 (patch)
treeb0838db00d82d00da303792174f8bea7da398693 /chrome/browser/tab_contents
parent411717bd115d80fa95387ac9ea26a0fb00bf0f5f (diff)
downloadchromium_src-8819206f48b04c853ab9a05e6cf3161370780b19.zip
chromium_src-8819206f48b04c853ab9a05e6cf3161370780b19.tar.gz
chromium_src-8819206f48b04c853ab9a05e6cf3161370780b19.tar.bz2
Fonts and Languages Linux GTK Preparation
Rearranged the windows and mac ports to use the cross platform interfaces. Updated windows fonts and languages to use those interfaces. As well, created stubs for mac platform. BUG=13524 (http://crbug.com/13524) TEST=Open a webpage with a textfield, right click and choose Spell checker options > Language Settings. Tested this on windows as well. Review URL: http://codereview.chromium.org/140043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/render_view_context_menu.cc22
1 files changed, 4 insertions, 18 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index f7505a7..ecb3eba 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -12,6 +12,7 @@
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/fonts_languages_window.h"
#include "chrome/browser/page_info_window.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/search_engines/template_url_model.h"
@@ -26,10 +27,6 @@
#include "net/base/escape.h"
#include "net/base/net_util.h"
-#if defined(OS_WIN)
-#include "chrome/browser/views/options/fonts_languages_window_view.h"
-#endif
-
RenderViewContextMenu::RenderViewContextMenu(
TabContents* tab_contents,
const ContextMenuParams& params)
@@ -556,23 +553,12 @@ void RenderViewContextMenu::ExecuteItemCommand(int id) {
params_.misspelled_word);
break;
- case IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS: {
-#if defined(OS_WIN)
- // TODO(yusukes): This should be moved to some shared place of commands
- // for the options stuff so that we don't have to do all this work here.
- FontsLanguagesWindowView* window_ = new FontsLanguagesWindowView(
- profile_);
- views::Window::CreateChromeWindow(
+ case IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS:
+ ShowFontsLanguagesWindow(
platform_util::GetTopLevel(
source_tab_contents_->GetContentNativeView()),
- gfx::Rect(), window_)->Show();
- window_->SelectLanguagesTab();
-#else
- // TODO(port): need views::Window
- NOTIMPLEMENTED() << "IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS";
-#endif
+ LANGUAGES_PAGE, profile_);
break;
- }
case IDS_CONTENT_CONTEXT_ADDSEARCHENGINE: // Not implemented.
default: