| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "NavigationPolicy.h" | 32 #include "NavigationPolicy.h" |
| 33 | 33 |
| 34 #include "wtf/Assertions.h" | 34 #include "wtf/Assertions.h" |
| 35 | 35 |
| 36 namespace WebCore { | 36 namespace WebCore { |
| 37 | 37 |
| 38 bool navigationPolicyFromMouseEvent(unsigned short button, bool ctrl, bool shift
, bool alt, bool meta, NavigationPolicy* policy) | 38 bool navigationPolicyFromMouseEvent(unsigned short button, bool ctrl, bool shift
, bool alt, bool meta, NavigationPolicy* policy) |
| 39 { | 39 { |
| 40 #if OS(DARWIN) | 40 #if OS(MACOSX) |
| 41 const bool newTabModifier = (button == 1) || meta; | 41 const bool newTabModifier = (button == 1) || meta; |
| 42 #else | 42 #else |
| 43 const bool newTabModifier = (button == 1) || ctrl; | 43 const bool newTabModifier = (button == 1) || ctrl; |
| 44 #endif | 44 #endif |
| 45 if (!newTabModifier && !shift && !alt) | 45 if (!newTabModifier && !shift && !alt) |
| 46 return false; | 46 return false; |
| 47 | 47 |
| 48 ASSERT(policy); | 48 ASSERT(policy); |
| 49 if (newTabModifier) { | 49 if (newTabModifier) { |
| 50 if (shift) | 50 if (shift) |
| 51 *policy = NavigationPolicyNewForegroundTab; | 51 *policy = NavigationPolicyNewForegroundTab; |
| 52 else | 52 else |
| 53 *policy = NavigationPolicyNewBackgroundTab; | 53 *policy = NavigationPolicyNewBackgroundTab; |
| 54 } else { | 54 } else { |
| 55 if (shift) | 55 if (shift) |
| 56 *policy = NavigationPolicyNewWindow; | 56 *policy = NavigationPolicyNewWindow; |
| 57 else | 57 else |
| 58 *policy = NavigationPolicyDownload; | 58 *policy = NavigationPolicyDownload; |
| 59 } | 59 } |
| 60 return true; | 60 return true; |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace WebCore | 63 } // namespace WebCore |
| 64 | 64 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 14107015:
Rename OS(DARWIN) to OS(MACOSX). (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master