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/controls/native/native_view_host_gtk.h" | 5 #include "views/controls/native/native_view_host_gtk.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "views/controls/native/native_view_host.h" | 11 #include "views/controls/native/native_view_host.h" |
12 #include "views/controls/native/native_view_host_views.h" | 12 #include "views/controls/native/native_view_host_views.h" |
13 #include "views/focus/focus_manager.h" | 13 #include "views/focus/focus_manager.h" |
| 14 #include "views/views_delegate.h" |
14 #include "views/widget/gtk_views_fixed.h" | 15 #include "views/widget/gtk_views_fixed.h" |
15 #include "views/widget/native_widget_gtk.h" | 16 #include "views/widget/native_widget_gtk.h" |
16 #include "views/widget/widget.h" | 17 #include "views/widget/widget.h" |
17 | 18 |
18 namespace views { | 19 namespace views { |
19 | 20 |
20 namespace { | 21 namespace { |
21 static bool signal_id_initialized_ = false; | 22 static bool signal_id_initialized_ = false; |
22 static guint focus_in_event_signal_id_; | 23 static guint focus_in_event_signal_id_; |
23 static guint focus_out_event_signal_id_; | 24 static guint focus_out_event_signal_id_; |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 focus_manager->SetFocusedView(host->host_->focus_view()); | 371 focus_manager->SetFocusedView(host->host_->focus_view()); |
371 return false; | 372 return false; |
372 } | 373 } |
373 | 374 |
374 //////////////////////////////////////////////////////////////////////////////// | 375 //////////////////////////////////////////////////////////////////////////////// |
375 // NativeViewHostWrapper, public: | 376 // NativeViewHostWrapper, public: |
376 | 377 |
377 // static | 378 // static |
378 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper( | 379 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper( |
379 NativeViewHost* host) { | 380 NativeViewHost* host) { |
380 if (Widget::IsPureViews()) | 381 if (Widget::IsPureViews() && |
| 382 views::ViewsDelegate::views_delegate->GetDefaultParentView()) |
381 return new NativeViewHostViews(host); | 383 return new NativeViewHostViews(host); |
382 return new NativeViewHostGtk(host); | 384 return new NativeViewHostGtk(host); |
383 } | 385 } |
384 | 386 |
385 } // namespace views | 387 } // namespace views |
OLD | NEW |