diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 00:45:28 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 00:45:28 +0000 |
| commit | 893124a21e216eea2e3b7f9851a478f6f08bbf4f (patch) | |
| tree | 0e814dbe545afd950a943ce296020e597b84a0ef /apps | |
| parent | 60bbbbde53dace07e8dbb383aace4a46c3b8276b (diff) | |
| download | chromium_src-893124a21e216eea2e3b7f9851a478f6f08bbf4f.zip chromium_src-893124a21e216eea2e3b7f9851a478f6f08bbf4f.tar.gz chromium_src-893124a21e216eea2e3b7f9851a478f6f08bbf4f.tar.bz2 | |
More removal of GTK code.
BUG=297026
Review URL: https://codereview.chromium.org/232773008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_window_browsertest.cc | 4 | ||||
| -rw-r--r-- | apps/ui/web_contents_sizer.cc | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/apps/app_window_browsertest.cc b/apps/app_window_browsertest.cc index e79a6d4..22446a3 100644 --- a/apps/app_window_browsertest.cc +++ b/apps/app_window_browsertest.cc @@ -16,7 +16,7 @@ typedef extensions::PlatformAppBrowserTest AppWindowBrowserTest; // This test is disabled on Linux because of the unpredictable nature of native // windows. We cannot assume that the window manager will insert any title bar // at all, so the test may fail on certain window managers. -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) #define MAYBE_FrameInsetsForDefaultFrame DISABLED_FrameInsetsForDefaultFrame #else #define MAYBE_FrameInsetsForDefaultFrame FrameInsetsForDefaultFrame @@ -39,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) { // This test is also disabled on Linux because frame: color is ignored on stable // and beta channels (so it can fail the same as the previous test). // TODO(benwells): Re-enable on Linux after frame: color is on stable. -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) #define MAYBE_FrameInsetsForColoredFrame DISABLED_FrameInsetsForColoredFrame #else #define MAYBE_FrameInsetsForColoredFrame FrameInsetsForColoredFrame diff --git a/apps/ui/web_contents_sizer.cc b/apps/ui/web_contents_sizer.cc index e19f2cf..041187f 100644 --- a/apps/ui/web_contents_sizer.cc +++ b/apps/ui/web_contents_sizer.cc @@ -9,8 +9,6 @@ #if defined(USE_AURA) #include "ui/aura/window.h" -#elif defined(TOOLKIT_GTK) -#include <gtk/gtk.h> #elif defined(OS_ANDROID) #include "content/public/browser/render_widget_host_view.h" #endif @@ -22,9 +20,6 @@ void ResizeWebContents(content::WebContents* web_contents, #if defined(USE_AURA) aura::Window* window = web_contents->GetView()->GetNativeView(); window->SetBounds(gfx::Rect(window->bounds().origin(), new_size)); -#elif defined(TOOLKIT_GTK) - GtkWidget* widget = web_contents->GetView()->GetNativeView(); - gtk_widget_set_size_request(widget, new_size.width(), new_size.height()); #elif defined(OS_ANDROID) content::RenderWidgetHostView* view = web_contents->GetRenderWidgetHostView(); if (view) |