| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 , locationBarVisible(true) | 77 , locationBarVisible(true) |
| 78 , scrollbarsVisible(true) | 78 , scrollbarsVisible(true) |
| 79 , resizable(true) | 79 , resizable(true) |
| 80 , fullscreen(false) | 80 , fullscreen(false) |
| 81 , dialog(false) | 81 , dialog(false) |
| 82 { | 82 { |
| 83 } | 83 } |
| 84 | 84 |
| 85 | 85 |
| 86 #if BLINK_IMPLEMENTATION | 86 #if BLINK_IMPLEMENTATION |
| 87 WebWindowFeatures(const WebCore::WindowFeatures& f) | 87 WebWindowFeatures(const blink::WindowFeatures& f) |
| 88 : x(f.x) | 88 : x(f.x) |
| 89 , xSet(f.xSet) | 89 , xSet(f.xSet) |
| 90 , y(f.y) | 90 , y(f.y) |
| 91 , ySet(f.ySet) | 91 , ySet(f.ySet) |
| 92 , width(f.width) | 92 , width(f.width) |
| 93 , widthSet(f.widthSet) | 93 , widthSet(f.widthSet) |
| 94 , height(f.height) | 94 , height(f.height) |
| 95 , heightSet(f.heightSet) | 95 , heightSet(f.heightSet) |
| 96 , menuBarVisible(f.menuBarVisible) | 96 , menuBarVisible(f.menuBarVisible) |
| 97 , statusBarVisible(f.statusBarVisible) | 97 , statusBarVisible(f.statusBarVisible) |
| 98 , toolBarVisible(f.toolBarVisible) | 98 , toolBarVisible(f.toolBarVisible) |
| 99 , locationBarVisible(f.locationBarVisible) | 99 , locationBarVisible(f.locationBarVisible) |
| 100 , scrollbarsVisible(f.scrollbarsVisible) | 100 , scrollbarsVisible(f.scrollbarsVisible) |
| 101 , resizable(f.resizable) | 101 , resizable(f.resizable) |
| 102 , fullscreen(f.fullscreen) | 102 , fullscreen(f.fullscreen) |
| 103 , dialog(f.dialog) | 103 , dialog(f.dialog) |
| 104 , additionalFeatures(f.additionalFeatures) | 104 , additionalFeatures(f.additionalFeatures) |
| 105 { | 105 { |
| 106 } | 106 } |
| 107 | 107 |
| 108 operator WebCore::WindowFeatures() const | 108 operator blink::WindowFeatures() const |
| 109 { | 109 { |
| 110 WebCore::WindowFeatures result; | 110 blink::WindowFeatures result; |
| 111 result.x = x; | 111 result.x = x; |
| 112 result.xSet = xSet; | 112 result.xSet = xSet; |
| 113 result.y = y; | 113 result.y = y; |
| 114 result.ySet = ySet; | 114 result.ySet = ySet; |
| 115 result.width = width; | 115 result.width = width; |
| 116 result.widthSet = widthSet; | 116 result.widthSet = widthSet; |
| 117 result.height = height; | 117 result.height = height; |
| 118 result.heightSet = heightSet; | 118 result.heightSet = heightSet; |
| 119 result.menuBarVisible = menuBarVisible; | 119 result.menuBarVisible = menuBarVisible; |
| 120 result.statusBarVisible = statusBarVisible; | 120 result.statusBarVisible = statusBarVisible; |
| 121 result.toolBarVisible = toolBarVisible; | 121 result.toolBarVisible = toolBarVisible; |
| 122 result.locationBarVisible = locationBarVisible; | 122 result.locationBarVisible = locationBarVisible; |
| 123 result.scrollbarsVisible = scrollbarsVisible; | 123 result.scrollbarsVisible = scrollbarsVisible; |
| 124 result.resizable = resizable; | 124 result.resizable = resizable; |
| 125 result.fullscreen = fullscreen; | 125 result.fullscreen = fullscreen; |
| 126 result.dialog = dialog; | 126 result.dialog = dialog; |
| 127 for (size_t i = 0; i < additionalFeatures.size(); ++i) | 127 for (size_t i = 0; i < additionalFeatures.size(); ++i) |
| 128 result.additionalFeatures.append(additionalFeatures[i]); | 128 result.additionalFeatures.append(additionalFeatures[i]); |
| 129 return result; | 129 return result; |
| 130 } | 130 } |
| 131 #endif | 131 #endif |
| 132 }; | 132 }; |
| 133 | 133 |
| 134 } // namespace blink | 134 } // namespace blink |
| 135 | 135 |
| 136 #endif | 136 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 401973003:
Rename WebCore namespace to blink in Public (Closed)
Base URL: svn://svn.chromium.org/blink/trunk