Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: views/controls/native/native_view_host_gtk.cc

Issue 8598024: Now that we are doing a hard-cut-over to Aura, remove a bunch of *Views based classes that are ob... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "views/controls/native/native_view_host.h" 12 #include "views/controls/native/native_view_host.h"
13 #include "views/controls/native/native_view_host_views.h"
14 #include "ui/views/focus/focus_manager.h" 13 #include "ui/views/focus/focus_manager.h"
15 #include "views/views_delegate.h" 14 #include "views/views_delegate.h"
16 #include "views/widget/gtk_views_fixed.h" 15 #include "views/widget/gtk_views_fixed.h"
17 #include "views/widget/native_widget_gtk.h" 16 #include "views/widget/native_widget_gtk.h"
18 #include "views/widget/widget.h" 17 #include "views/widget/widget.h"
19 18
20 namespace views { 19 namespace views {
21 20
22 namespace { 21 namespace {
23 static bool signal_id_initialized_ = false; 22 static bool signal_id_initialized_ = false;
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 focus_manager->SetFocusedView(host->host_->focus_view()); 397 focus_manager->SetFocusedView(host->host_->focus_view());
399 return false; 398 return false;
400 } 399 }
401 400
402 //////////////////////////////////////////////////////////////////////////////// 401 ////////////////////////////////////////////////////////////////////////////////
403 // NativeViewHostWrapper, public: 402 // NativeViewHostWrapper, public:
404 403
405 // static 404 // static
406 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper( 405 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
407 NativeViewHost* host) { 406 NativeViewHost* host) {
408 if (Widget::IsPureViews() &&
409 views::ViewsDelegate::views_delegate->GetDefaultParentView())
410 return new NativeViewHostViews(host);
411 return new NativeViewHostGtk(host); 407 return new NativeViewHostGtk(host);
412 } 408 }
413 409
414 } // namespace views 410 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/native/native_view_host.cc ('k') | views/controls/native/native_view_host_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698