summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authormalcolm.2.wang@gmail.com <malcolm.2.wang@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-19 15:28:40 +0000
committermalcolm.2.wang@gmail.com <malcolm.2.wang@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-19 15:28:40 +0000
commit06d02b11b0bf54ea3a5ab9735626367607e5f122 (patch)
tree11a856a9e0bf48b15cea70d89988fa66144f4ac1 /base
parent5ff2851a231ac2a70c6fc7a4bd5907bcfa9d1366 (diff)
downloadchromium_src-06d02b11b0bf54ea3a5ab9735626367607e5f122.zip
chromium_src-06d02b11b0bf54ea3a5ab9735626367607e5f122.tar.gz
chromium_src-06d02b11b0bf54ea3a5ab9735626367607e5f122.tar.bz2
Fix not to close the bubble when entering full screen.
Listen to the full screen event, then if so, close the bubble. BUG=326081 Review URL: https://codereview.chromium.org/320393005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gypi1
-rw-r--r--base/mac/sdk_forward_declarations.h5
-rw-r--r--base/mac/sdk_forward_declarations.mm14
3 files changed, 19 insertions, 1 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 8c603a7..c033dcb 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -308,6 +308,7 @@
'mac/scoped_sending_event.mm',
'mac/scoped_typeref.h',
'mac/sdk_forward_declarations.h',
+ 'mac/sdk_forward_declarations.mm',
'macros.h',
'md5.cc',
'md5.h',
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h
index e53fdbd..3a0878da 100644
--- a/base/mac/sdk_forward_declarations.h
+++ b/base/mac/sdk_forward_declarations.h
@@ -16,6 +16,8 @@
#import <ImageCaptureCore/ImageCaptureCore.h>
#import <IOBluetooth/IOBluetooth.h>
+#include "base/base_export.h"
+
#if !defined(MAC_OS_X_VERSION_10_7) || \
MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
@@ -180,8 +182,9 @@ enum CWChannelBand {
- (IOReturn)performSDPQuery:(id)target uuids:(NSArray*)uuids;
@end
-#endif // MAC_OS_X_VERSION_10_7
+BASE_EXPORT extern "C" NSString* const NSWindowWillEnterFullScreenNotification;
+#endif // MAC_OS_X_VERSION_10_7
#if !defined(MAC_OS_X_VERSION_10_8) || \
MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
diff --git a/base/mac/sdk_forward_declarations.mm b/base/mac/sdk_forward_declarations.mm
new file mode 100644
index 0000000..a402a41
--- /dev/null
+++ b/base/mac/sdk_forward_declarations.mm
@@ -0,0 +1,14 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/mac/sdk_forward_declarations.h"
+
+// Replicate specific 10.7 SDK declarations for building with prior SDKs.
+#if !defined(MAC_OS_X_VERSION_10_7) || \
+ MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+
+NSString* const NSWindowWillEnterFullScreenNotification =
+ @"NSWindowWillEnterFullScreenNotification";
+
+#endif // MAC_OS_X_VERSION_10_7