patches/patch-chrome_browser_ui_views_frame_browser__view.cc

   1 $NetBSD$
   2
   3 --- chrome/browser/ui/views/frame/browser_view.cc.orig  2011-05-24 08:01:42.000000000 +0000
   4 +++ chrome/browser/ui/views/frame/browser_view.cc
   5 @@ -4,7 +4,7 @@
   6
   7  #include "chrome/browser/ui/views/frame/browser_view.h"
   8
   9 -#if defined(OS_LINUX)
  10 +#if defined(TOOLKIT_USES_GTK)
  11  #include <gtk/gtk.h>
  12  #endif
  13
  14 @@ -90,7 +90,7 @@
  15  #include "chrome/browser/jumplist_win.h"
  16  #include "ui/base/message_box_win.h"
  17  #include "ui/base/view_prop.h"
  18 -#elif defined(OS_LINUX)
  19 +#elif defined(TOOLKIT_USES_GTK)
  20  #include "chrome/browser/ui/views/accelerator_table_gtk.h"
  21  #include "views/window/hit_test.h"
  22  #include "views/window/window_gtk.h"
  23 @@ -1162,7 +1162,7 @@ void BrowserView::ShowProfileErrorDialog
  24    string16 message = l10n_util::GetStringUTF16(message_id);
  25    ui::MessageBox(GetNativeHandle(), message, title,
  26                   MB_OK | MB_ICONWARNING | MB_TOPMOST);
  27 -#elif defined(OS_LINUX)
  28 +#elif defined(TOOLKIT_USES_GTK)
  29    std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
  30    std::string message = l10n_util::GetStringUTF8(message_id);
  31    GtkWidget* dialog = gtk_message_dialog_new(GetNativeHandle(),
  32 @@ -1256,7 +1256,7 @@ bool BrowserView::PreHandleKeyboardEvent
  33    views::FocusManager* focus_manager = GetFocusManager();
  34    DCHECK(focus_manager);
  35
  36 -#if defined(OS_LINUX) && !defined(TOUCH_UI)
  37 +#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
  38    // Views and WebKit use different tables for GdkEventKey -> views::KeyEvent
  39    // conversion. We need to use View's conversion table here to keep consistent
  40    // behavior with views::FocusManager::OnKeyEvent() method.
  41 @@ -1303,7 +1303,7 @@ bool BrowserView::PreHandleKeyboardEvent
  42      return false;
  43
  44    // Executing the command may cause |this| object to be destroyed.
  45 -#if defined(OS_LINUX) && !defined(TOUCH_UI)
  46 +#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
  47    if (browser_->IsReservedCommandOrKey(id, event) &&
  48        !event.match_edit_command) {
  49  #else
  50 @@ -1320,7 +1320,7 @@ bool BrowserView::PreHandleKeyboardEvent
  51  }
  52
  53  void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
  54 -#if defined(OS_LINUX) && !defined(TOUCH_UI)
  55 +#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
  56    views::Window* window = GetWidget()->GetWindow();
  57    if (window && event.os_event && !event.skip_in_browser)
  58      static_cast<views::WindowGtk*>(window)->HandleKeyboardEvent(event.os_event);
  59 @@ -2247,7 +2247,7 @@ void BrowserView::ProcessFullscreen(bool
  60  #endif  // No need to invoke SetFullscreen for linux as this code is executed
  61          // once we're already fullscreen on linux.
  62
  63 -#if defined(OS_LINUX)
  64 +#if defined(TOOLKIT_USES_GTK)
  65    // Updating of commands for fullscreen mode is called from SetFullScreen on
  66    // Wndows (see just above), but for ChromeOS, this method (ProcessFullScreen)
  67    // is called after full screen has happened successfully (via GTK's