diff options
| -rw-r--r-- | ui/gfx/canvas_skia_linux.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/platform_font_gtk.cc | 2 | ||||
| -rw-r--r-- | views/aura_desktop/aura_desktop_main.cc | 4 | ||||
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 6 | ||||
| -rw-r--r-- | views/controls/menu/menu_controller.h | 2 | ||||
| -rw-r--r-- | views/drag_utils_linux.cc | 18 | ||||
| -rw-r--r-- | views/views.gyp | 12 | ||||
| -rw-r--r-- | views/window/dialog_client_view.cc | 2 |
8 files changed, 44 insertions, 4 deletions
diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_skia_linux.cc index c6214d7..3eb28bf 100644 --- a/ui/gfx/canvas_skia_linux.cc +++ b/ui/gfx/canvas_skia_linux.cc @@ -50,7 +50,7 @@ void UpdateCairoFontOptions() { gchar* hint_style = NULL; gchar* rgba_style = NULL; -#if !defined(USE_WAYLAND) +#if !defined(USE_WAYLAND) && !defined(USE_AURA) GtkSettings* gtk_settings = gtk_settings_get_default(); g_object_get(gtk_settings, "gtk-xft-antialias", &antialias, diff --git a/ui/gfx/platform_font_gtk.cc b/ui/gfx/platform_font_gtk.cc index 05e43fe..dad26f7 100644 --- a/ui/gfx/platform_font_gtk.cc +++ b/ui/gfx/platform_font_gtk.cc @@ -114,7 +114,7 @@ string16 FindBestMatchFontFamilyName(const char* family_name) { } std::string GetDefaultFont() { -#if defined(USE_WAYLAND) +#if defined(USE_WAYLAND) || defined(USE_AURA) return "sans 10"; #else GtkSettings* settings = gtk_settings_get_default(); diff --git a/views/aura_desktop/aura_desktop_main.cc b/views/aura_desktop/aura_desktop_main.cc index 93e22fa..ceed1ef 100644 --- a/views/aura_desktop/aura_desktop_main.cc +++ b/views/aura_desktop/aura_desktop_main.cc @@ -20,6 +20,10 @@ #include "views/widget/widget.h" #include "views/widget/widget_delegate.h" +#if !defined(OS_WIN) +#include "aura/hit_test.h" +#endif + namespace { // Trivial WindowDelegate implementation that draws a colored background. diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index acad114..1255610 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -877,6 +877,12 @@ base::MessagePumpDispatcher::DispatchStatus base::MessagePumpDispatcher::EVENT_QUIT : base::MessagePumpDispatcher::EVENT_PROCESSED; } +#elif defined(USE_AURA) +base::MessagePumpDispatcher::DispatchStatus + MenuController::Dispatch(XEvent* xev) { + NOTREACHED(); + return EVENT_PROCESSED; +} #elif defined(TOUCH_UI) base::MessagePumpDispatcher::DispatchStatus MenuController::Dispatch(XEvent* xev) { diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h index 91f4d79..0064f98 100644 --- a/views/controls/menu/menu_controller.h +++ b/views/controls/menu/menu_controller.h @@ -222,7 +222,7 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher { #elif defined(USE_WAYLAND) virtual base::MessagePumpDispatcher::DispatchStatus Dispatch( ui::WaylandEvent* event); -#elif defined(TOUCH_UI) +#elif defined(TOUCH_UI) || defined(USE_AURA) virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xevent); #else virtual bool Dispatch(GdkEvent* event); diff --git a/views/drag_utils_linux.cc b/views/drag_utils_linux.cc new file mode 100644 index 0000000..aeeaf32 --- /dev/null +++ b/views/drag_utils_linux.cc @@ -0,0 +1,18 @@ +// 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 "views/drag_utils.h" + +#include "base/logging.h" + +namespace drag_utils { + +void SetDragImageOnDataObject(const SkBitmap& bitmap, + const gfx::Size& size, + const gfx::Point& cursor_offset, + OSExchangeData* data_object) { + NOTIMPLEMENTED(); +} + +} // namespace drag_utils diff --git a/views/views.gyp b/views/views.gyp index cda9d27..e90ffbd 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -236,6 +236,7 @@ 'drag_utils.cc', 'drag_utils.h', 'drag_utils_gtk.cc', + 'drag_utils_linux.cc', 'drag_utils_win.cc', 'events/event.cc', 'events/event.h', @@ -417,6 +418,10 @@ 'dependencies': [ '../aura/aura.gyp:aura', ], + 'sources/': [ + ['exclude', '_(gtk|x)\\.cc$'], + ['exclude', '/(gtk|x)_[^/]*\\.cc$'], + ], 'sources!': [ 'controls/menu/menu_2.cc', 'controls/menu/menu_2.h', @@ -436,6 +441,8 @@ 'controls/table/table_view_observer.h', 'controls/tree/tree_view.cc', 'controls/tree/tree_view.h', + 'focus/accelerator_handler_aura.cc', + 'focus/accelerator_handler_touch.cc', 'widget/aero_tooltip_manager.cc', 'widget/aero_tooltip_manager.h', 'widget/child_window_message_processor.cc', @@ -451,6 +458,10 @@ ], }], ], + }, { # else: use_aura==1 + 'sources!': [ + 'drag_utils_linux.cc', + ] }], ['toolkit_uses_gtk == 1', { 'dependencies': [ @@ -842,6 +853,7 @@ 'target_name': 'views_aura_desktop', 'type': 'executable', 'dependencies': [ + '../aura/aura.gyp:aura', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../chrome/chrome.gyp:packed_resources', diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 562c8cc..1f50eb2 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -312,7 +312,7 @@ const DialogClientView* DialogClientView::AsDialogClientView() const { void DialogClientView::OnPaint(gfx::Canvas* canvas) { #if defined(OS_WIN) FillViewWithSysColor(canvas, this, GetSysColor(COLOR_3DFACE)); -#elif defined(USE_WAYLAND) +#elif defined(USE_WAYLAND) || defined(USE_AURA) SkColor sk_color = SkColorSetARGB(200, 255, 255, 255); canvas->FillRectInt(sk_color, 0, 0, width(), height()); #else |