OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "views/widget/native_widget_gtk.h" | 5 #include "views/widget/native_widget_gtk.h" |
6 | 6 |
7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
8 #include <gdk/gdkx.h> | 8 #include <gdk/gdkx.h> |
9 #include <X11/extensions/shape.h> | 9 #include <X11/extensions/shape.h> |
10 #include <X11/Xatom.h> | 10 #include <X11/Xatom.h> |
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 // Make container here. | 684 // Make container here. |
685 CreateGtkWidget(modified_params); | 685 CreateGtkWidget(modified_params); |
686 | 686 |
687 if (params.type == Widget::InitParams::TYPE_MENU) { | 687 if (params.type == Widget::InitParams::TYPE_MENU) { |
688 gtk_window_set_destroy_with_parent(GTK_WINDOW(GetNativeView()), TRUE); | 688 gtk_window_set_destroy_with_parent(GTK_WINDOW(GetNativeView()), TRUE); |
689 gtk_window_set_type_hint(GTK_WINDOW(GetNativeView()), | 689 gtk_window_set_type_hint(GTK_WINDOW(GetNativeView()), |
690 GDK_WINDOW_TYPE_HINT_MENU); | 690 GDK_WINDOW_TYPE_HINT_MENU); |
691 } | 691 } |
692 | 692 |
693 if (View::get_use_acceleration_when_possible()) { | 693 if (View::get_use_acceleration_when_possible()) { |
694 if (Widget::compositor_factory()) { | 694 if (ui::Compositor::compositor_factory()) { |
695 compositor_ = (*Widget::compositor_factory())(); | 695 compositor_ = (*ui::Compositor::compositor_factory())(this); |
696 } else { | 696 } else { |
697 gint width, height; | 697 gint width, height; |
698 gdk_drawable_get_size(window_contents_->window, &width, &height); | 698 gdk_drawable_get_size(window_contents_->window, &width, &height); |
699 compositor_ = ui::Compositor::Create(this, | 699 compositor_ = ui::Compositor::Create(this, |
700 GDK_WINDOW_XID(window_contents_->window), | 700 GDK_WINDOW_XID(window_contents_->window), |
701 gfx::Size(width, height)); | 701 gfx::Size(width, height)); |
702 } | 702 } |
703 if (compositor_.get()) { | 703 if (compositor_.get()) { |
704 View* root_view = delegate_->AsWidget()->GetRootView(); | 704 View* root_view = delegate_->AsWidget()->GetRootView(); |
705 root_view->SetPaintToLayer(true); | 705 root_view->SetPaintToLayer(true); |
(...skipping 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2306 button_pressed = event->type == GDK_BUTTON_PRESS || | 2306 button_pressed = event->type == GDK_BUTTON_PRESS || |
2307 event->type == GDK_2BUTTON_PRESS || | 2307 event->type == GDK_2BUTTON_PRESS || |
2308 event->type == GDK_3BUTTON_PRESS; | 2308 event->type == GDK_3BUTTON_PRESS; |
2309 gdk_event_free(event); | 2309 gdk_event_free(event); |
2310 } | 2310 } |
2311 return button_pressed; | 2311 return button_pressed; |
2312 } | 2312 } |
2313 | 2313 |
2314 } // namespace internal | 2314 } // namespace internal |
2315 } // namespace views | 2315 } // namespace views |
OLD | NEW |