| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 { | 69 { |
| 70 return m_iconURL; | 70 return m_iconURL; |
| 71 } | 71 } |
| 72 | 72 |
| 73 const WebVector<WebSize>& sizes() const | 73 const WebVector<WebSize>& sizes() const |
| 74 { | 74 { |
| 75 return m_sizes; | 75 return m_sizes; |
| 76 } | 76 } |
| 77 | 77 |
| 78 #if BLINK_IMPLEMENTATION | 78 #if BLINK_IMPLEMENTATION |
| 79 WebIconURL(const WebCore::IconURL& iconURL) | 79 WebIconURL(const blink::IconURL& iconURL) |
| 80 : m_iconType(static_cast<Type>(iconURL.m_iconType)) | 80 : m_iconType(static_cast<Type>(iconURL.m_iconType)) |
| 81 , m_iconURL(iconURL.m_iconURL) | 81 , m_iconURL(iconURL.m_iconURL) |
| 82 , m_sizes(iconURL.m_sizes) | 82 , m_sizes(iconURL.m_sizes) |
| 83 { | 83 { |
| 84 } | 84 } |
| 85 #endif | 85 #endif |
| 86 | 86 |
| 87 private: | 87 private: |
| 88 Type m_iconType; | 88 Type m_iconType; |
| 89 WebURL m_iconURL; | 89 WebURL m_iconURL; |
| 90 WebVector<WebSize> m_sizes; | 90 WebVector<WebSize> m_sizes; |
| 91 }; | 91 }; |
| 92 | 92 |
| 93 } | 93 } |
| 94 | 94 |
| 95 #endif // WebIconURL_h | 95 #endif // WebIconURL_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 401973003:
Rename WebCore namespace to blink in Public (Closed)
Base URL: svn://svn.chromium.org/blink/trunk