chromium/src
0
Fork 0
Code Activity

make browser_tests compile and link under use_aura=1 chromeos=0.

Browse Source 
BUG=99362
TEST=None


Review URL: http://codereview.chromium.org/8190012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104574 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
alicet@chromium.org
2011-10-07 21:54:22 +00:00
parent fa48a62bae
commit 442b7d333b
4 changed files with 30 additions and 3 deletions

4
chrome/test/base/render_view_test.cc

@@ -31,7 +31,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"
#if defined(OS_LINUX) #if defined(OS_LINUX) && !defined(USE_AURA)
#include "ui/base/gtk/event_synthesis_gtk.h" #include "ui/base/gtk/event_synthesis_gtk.h"
#endif #endif
@@ -211,7 +211,7 @@ int RenderViewTest::SendKeyEvent(MockKeyboard::Layout layout,
SendNativeKeyEvent(keyup_event); SendNativeKeyEvent(keyup_event);
return length; return length;
#elif defined(OS_LINUX) #elif defined(OS_LINUX) && !defined(USE_AURA)
// We ignore |layout|, which means we are only testing the layout of the // We ignore |layout|, which means we are only testing the layout of the
// current locale. TODO(estade): fix this to respect |layout|. // current locale. TODO(estade): fix this to respect |layout|.
std::vector<GdkEvent*> events; std::vector<GdkEvent*> events;

12
chrome/test/base/ui_test_utils_linux.cc

@@ -4,7 +4,9 @@
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
#if !defined(USE_AURA)
#include <gtk/gtk.h> #include <gtk/gtk.h>
#endif
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop.h" #include "base/message_loop.h"
@@ -19,7 +21,7 @@
namespace ui_test_utils { namespace ui_test_utils {
#if !defined(TOOLKIT_VIEWS) #if !defined(TOOLKIT_VIEWS) && !defined(USE_AURA)
namespace { namespace {
// Check if the focused widget for |root| is |target| or a child of |target|. // Check if the focused widget for |root| is |target| or a child of |target|.
@@ -84,14 +86,22 @@ void ClickOnView(const Browser* browser, ViewID vid) {
} }
void HideNativeWindow(gfx::NativeWindow window) { void HideNativeWindow(gfx::NativeWindow window) {
#if !defined(USE_AURA)
gtk_widget_hide(GTK_WIDGET(window)); gtk_widget_hide(GTK_WIDGET(window));
#else
NOTIMPLEMENTED();
#endif
} }
void ShowAndFocusNativeWindow(gfx::NativeWindow window) { void ShowAndFocusNativeWindow(gfx::NativeWindow window) {
#if !defined(USE_AURA)
if (gtk_window_has_toplevel_focus(GTK_WINDOW(window))) if (gtk_window_has_toplevel_focus(GTK_WINDOW(window)))
return; return;
gtk_window_present(GTK_WINDOW(window)); gtk_window_present(GTK_WINDOW(window));
#else
NOTIMPLEMENTED();
#endif
} }
} // namespace ui_test_utils } // namespace ui_test_utils

16
printing/image_aura.cc Normal file

@@ -0,0 +1,16 @@
// 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.
#include "printing/image.h"
#include "base/logging.h"
namespace printing {
bool Image::LoadMetafile(const Metafile& metafile) {
NOTIMPLEMENTED();
return false;
}
} // namespace printing

1
printing/printing.gyp

@@ -35,6 +35,7 @@
'emf_win.cc', 'emf_win.cc',
'emf_win.h', 'emf_win.h',
'image.cc', 'image.cc',
'image_aura.cc',
'image_cairo.cc', 'image_cairo.cc',
'image_mac.cc', 'image_mac.cc',
'image_win.cc', 'image_win.cc',