summaryrefslogtreecommitdiffstats
path: root/base/mac
diff options
context:
space:
mode:
authorscheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 02:04:55 +0000
committerscheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 02:04:55 +0000
commit81e495e82fde9e5cc3f7421ee60329085b67a69c (patch)
treedc7153fe6d6ac6fdd406a8b1abc4d42e894c80e9 /base/mac
parent1a24d8c83f4e4f6560c6646127f6ae26d9dab120 (diff)
downloadchromium_src-81e495e82fde9e5cc3f7421ee60329085b67a69c.zip
chromium_src-81e495e82fde9e5cc3f7421ee60329085b67a69c.tar.gz
chromium_src-81e495e82fde9e5cc3f7421ee60329085b67a69c.tar.bz2
Enable WindowsApiProperties on mac by fixing DCHECK.
ReleaseFullScreen incorrectly DCHECKed > 0 instead of >= 0. BUG=229700 Review URL: https://chromiumcodereview.appspot.com/13973005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
-rw-r--r--base/mac/mac_util.mm8
1 files changed, 7 insertions, 1 deletions
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
index a6501a41..f758b52 100644
--- a/base/mac/mac_util.mm
+++ b/base/mac/mac_util.mm
@@ -180,6 +180,9 @@ void RequestFullScreen(FullScreenMode mode) {
return;
DCHECK_GE(g_full_screen_requests[mode], 0);
+ if (mode < 0)
+ return;
+
g_full_screen_requests[mode] = std::max(g_full_screen_requests[mode] + 1, 1);
SetUIMode();
}
@@ -190,7 +193,10 @@ void ReleaseFullScreen(FullScreenMode mode) {
if (mode >= kNumFullScreenModes)
return;
- DCHECK_GT(g_full_screen_requests[mode], 0);
+ DCHECK_GE(g_full_screen_requests[mode], 0);
+ if (mode < 0)
+ return;
+
g_full_screen_requests[mode] = std::max(g_full_screen_requests[mode] - 1, 0);
SetUIMode();
}