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

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

Issue 826083003: MacViews: Fix WidgetWithDestroyedNativeViewTest.Test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150701-MacViews-grd-changes
Patch Set: Created 5 years, 11 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
« 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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 void NativeWidgetMac::ReorderNativeViews() { 188 void NativeWidgetMac::ReorderNativeViews() {
189 if (bridge_) 189 if (bridge_)
190 bridge_->SetRootView(GetWidget()->GetRootView()); 190 bridge_->SetRootView(GetWidget()->GetRootView());
191 } 191 }
192 192
193 void NativeWidgetMac::ViewRemoved(View* view) { 193 void NativeWidgetMac::ViewRemoved(View* view) {
194 NOTIMPLEMENTED(); 194 NOTIMPLEMENTED();
195 } 195 }
196 196
197 void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) { 197 void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) {
198 bridge_->SetNativeWindowProperty(name, value); 198 if (bridge_)
199 bridge_->SetNativeWindowProperty(name, value);
199 } 200 }
200 201
201 void* NativeWidgetMac::GetNativeWindowProperty(const char* name) const { 202 void* NativeWidgetMac::GetNativeWindowProperty(const char* name) const {
202 return bridge_->GetNativeWindowProperty(name); 203 if (bridge_)
204 return bridge_->GetNativeWindowProperty(name);
205
206 return nullptr;
203 } 207 }
204 208
205 TooltipManager* NativeWidgetMac::GetTooltipManager() const { 209 TooltipManager* NativeWidgetMac::GetTooltipManager() const {
206 NOTIMPLEMENTED(); 210 NOTIMPLEMENTED();
207 return NULL; 211 return NULL;
208 } 212 }
209 213
210 void NativeWidgetMac::SetCapture() { 214 void NativeWidgetMac::SetCapture() {
211 if (bridge_ && !bridge_->HasCapture()) 215 if (bridge_ && !bridge_->HasCapture())
212 bridge_->AcquireCapture(); 216 bridge_->AcquireCapture();
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 } 643 }
640 644
641 // static 645 // static
642 gfx::FontList NativeWidgetPrivate::GetWindowTitleFontList() { 646 gfx::FontList NativeWidgetPrivate::GetWindowTitleFontList() {
643 NOTIMPLEMENTED(); 647 NOTIMPLEMENTED();
644 return gfx::FontList(); 648 return gfx::FontList();
645 } 649 }
646 650
647 } // namespace internal 651 } // namespace internal
648 } // namespace views 652 } // namespace views
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