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

Side by Side Diff: ui/views/widget/native_widget_mac.mm

Issue 982193003: MacViews: Emit NOTIMPLEMENTED() in NativeWidgetMac::ViewRemoved() only when potentially dragging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150129-MacViews-Bringup5
Patch Set: rebase; emit when mouse button donw Created 5 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_mac.h" 5 #include "ui/views/widget/native_widget_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/mac/foundation_util.h" 9 #include "base/mac/foundation_util.h"
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 const ui::Layer* NativeWidgetMac::GetLayer() const { 187 const ui::Layer* NativeWidgetMac::GetLayer() const {
188 return bridge_ ? bridge_->layer() : nullptr; 188 return bridge_ ? bridge_->layer() : nullptr;
189 } 189 }
190 190
191 void NativeWidgetMac::ReorderNativeViews() { 191 void NativeWidgetMac::ReorderNativeViews() {
192 if (bridge_) 192 if (bridge_)
193 bridge_->SetRootView(GetWidget()->GetRootView()); 193 bridge_->SetRootView(GetWidget()->GetRootView());
194 } 194 }
195 195
196 void NativeWidgetMac::ViewRemoved(View* view) { 196 void NativeWidgetMac::ViewRemoved(View* view) {
197 NOTIMPLEMENTED(); 197 // TODO(tapted): Something for drag and drop might be needed here in future.
198 // See http://crbug.com/464581. A NOTIMPLEMENTED() here makes a lot of spam,
199 // so only emit it when a drag and drop could be likely.
200 if (IsMouseButtonDown())
201 NOTIMPLEMENTED();
198 } 202 }
199 203
200 void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) { 204 void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) {
201 if (bridge_) 205 if (bridge_)
202 bridge_->SetNativeWindowProperty(name, value); 206 bridge_->SetNativeWindowProperty(name, value);
203 } 207 }
204 208
205 void* NativeWidgetMac::GetNativeWindowProperty(const char* name) const { 209 void* NativeWidgetMac::GetNativeWindowProperty(const char* name) const {
206 if (bridge_) 210 if (bridge_)
207 return bridge_->GetNativeWindowProperty(name); 211 return bridge_->GetNativeWindowProperty(name);
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 [[ViewsNSWindowCloseAnimator alloc] initWithWindow:window]; 718 [[ViewsNSWindowCloseAnimator alloc] initWithWindow:window];
715 } 719 }
716 720
717 - (void)animationDidEnd:(NSAnimation*)animation { 721 - (void)animationDidEnd:(NSAnimation*)animation {
718 [window_ close]; 722 [window_ close];
719 [animation_ setDelegate:nil]; 723 [animation_ setDelegate:nil];
720 [self release]; 724 [self release];
721 } 725 }
722 726
723 @end 727 @end
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698