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

Side by Side Diff: ui/views/widget/native_widget_aura.cc

Issue 307623002: MacViews: Replace NativeWidget::GetEventHandler() with RepostNativeEvent(..) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20140528-MacViews-examples_exe
Patch Set: Created 6 years, 6 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 944
945 int NativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) { 945 int NativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
946 DCHECK(drop_helper_.get() != NULL); 946 DCHECK(drop_helper_.get() != NULL);
947 return drop_helper_->OnDrop(event.data(), event.location(), 947 return drop_helper_->OnDrop(event.data(), event.location(),
948 last_drop_operation_); 948 last_drop_operation_);
949 } 949 }
950 950
951 //////////////////////////////////////////////////////////////////////////////// 951 ////////////////////////////////////////////////////////////////////////////////
952 // NativeWidgetAura, NativeWidget implementation: 952 // NativeWidgetAura, NativeWidget implementation:
953 953
954 ui::EventHandler* NativeWidgetAura::GetEventHandler() { 954 void NativeWidgetAura::RepostNativeEvent(gfx::NativeEvent os_event) {
955 return this; 955 OnEvent(os_event);
956 } 956 }
957 957
958 //////////////////////////////////////////////////////////////////////////////// 958 ////////////////////////////////////////////////////////////////////////////////
959 // NativeWidgetAura, protected: 959 // NativeWidgetAura, protected:
960 960
961 NativeWidgetAura::~NativeWidgetAura() { 961 NativeWidgetAura::~NativeWidgetAura() {
962 destroying_ = true; 962 destroying_ = true;
963 if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) 963 if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
964 delete delegate_; 964 delete delegate_;
965 else 965 else
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); 1158 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
1159 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); 1159 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
1160 return gfx::FontList(gfx::Font(caption_font)); 1160 return gfx::FontList(gfx::Font(caption_font));
1161 #else 1161 #else
1162 return gfx::FontList(); 1162 return gfx::FontList();
1163 #endif 1163 #endif
1164 } 1164 }
1165 1165
1166 } // namespace internal 1166 } // namespace internal
1167 } // namespace views 1167 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698