summaryrefslogtreecommitdiffstats
path: root/chrome/browser/platform_util_mac.mm
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-18 18:32:45 +0000
committerBen Murdoch <benm@google.com>2010-11-18 18:38:07 +0000
commit513209b27ff55e2841eac0e4120199c23acce758 (patch)
treeaeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/platform_util_mac.mm
parent164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff)
downloadexternal_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/platform_util_mac.mm')
-rw-r--r--chrome/browser/platform_util_mac.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm
index d7da563..719183d 100644
--- a/chrome/browser/platform_util_mac.mm
+++ b/chrome/browser/platform_util_mac.mm
@@ -132,6 +132,10 @@ gfx::NativeWindow GetTopLevel(gfx::NativeView view) {
return [view window];
}
+gfx::NativeView GetParent(gfx::NativeView view) {
+ return nil;
+}
+
bool IsWindowActive(gfx::NativeWindow window) {
return [window isKeyWindow] || [window isMainWindow];
}