| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Multiply-included file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
| 6 #include <map> | 6 #include <map> |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 kUnauthorized, | 65 kUnauthorized, |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 ChromeViewHostMsg_GetPluginInfo_Status() : value(kAllowed) {} | 68 ChromeViewHostMsg_GetPluginInfo_Status() : value(kAllowed) {} |
| 69 | 69 |
| 70 Value value; | 70 Value value; |
| 71 }; | 71 }; |
| 72 | 72 |
| 73 namespace IPC { | 73 namespace IPC { |
| 74 | 74 |
| 75 #if defined(OS_POSIX) && !defined(USE_AURA) | 75 #if defined(OS_POSIX) && !defined(USE_AURA) && !defined(OS_ANDROID) |
| 76 | 76 |
| 77 // TODO(port): this shouldn't exist. However, the plugin stuff is really using | 77 // TODO(port): this shouldn't exist. However, the plugin stuff is really using |
| 78 // HWNDS (NativeView), and making Windows calls based on them. I've not figured | 78 // HWNDS (NativeView), and making Windows calls based on them. I've not figured |
| 79 // out the deal with plugins yet. | 79 // out the deal with plugins yet. |
| 80 // TODO(android): a gfx::NativeView is the same as a gfx::NativeWindow. |
| 80 template <> | 81 template <> |
| 81 struct ParamTraits<gfx::NativeView> { | 82 struct ParamTraits<gfx::NativeView> { |
| 82 typedef gfx::NativeView param_type; | 83 typedef gfx::NativeView param_type; |
| 83 static void Write(Message* m, const param_type& p) { | 84 static void Write(Message* m, const param_type& p) { |
| 84 NOTIMPLEMENTED(); | 85 NOTIMPLEMENTED(); |
| 85 } | 86 } |
| 86 | 87 |
| 87 static bool Read(const Message* m, void** iter, param_type* p) { | 88 static bool Read(const Message* m, void** iter, param_type* p) { |
| 88 NOTIMPLEMENTED(); | 89 NOTIMPLEMENTED(); |
| 89 *p = NULL; | 90 *p = NULL; |
| 90 return true; | 91 return true; |
| 91 } | 92 } |
| 92 | 93 |
| 93 static void Log(const param_type& p, std::string* l) { | 94 static void Log(const param_type& p, std::string* l) { |
| 94 l->append(base::StringPrintf("<gfx::NativeView>")); | 95 l->append(base::StringPrintf("<gfx::NativeView>")); |
| 95 } | 96 } |
| 96 }; | 97 }; |
| 97 | 98 |
| 98 #endif // defined(OS_POSIX) && !defined(USE_AURA) | 99 #endif // defined(OS_POSIX) && !defined(USE_AURA) && !defined(OS_ANDROID) |
| 99 | 100 |
| 100 template <> | 101 template <> |
| 101 struct ParamTraits<ContentSettingsPattern> { | 102 struct ParamTraits<ContentSettingsPattern> { |
| 102 typedef ContentSettingsPattern param_type; | 103 typedef ContentSettingsPattern param_type; |
| 103 static void Write(Message* m, const param_type& p); | 104 static void Write(Message* m, const param_type& p); |
| 104 static bool Read(const Message* m, void** iter, param_type* r); | 105 static bool Read(const Message* m, void** iter, param_type* r); |
| 105 static void Log(const param_type& p, std::string* l); | 106 static void Log(const param_type& p, std::string* l); |
| 106 }; | 107 }; |
| 107 | 108 |
| 108 } // namespace IPC | 109 } // namespace IPC |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 622 // previous SetCookie message to be processed. | 623 // previous SetCookie message to be processed. |
| 623 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, | 624 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, |
| 624 GURL /* url */, | 625 GURL /* url */, |
| 625 GURL /* first_party_for_cookies */, | 626 GURL /* first_party_for_cookies */, |
| 626 std::string /* cookies */) | 627 std::string /* cookies */) |
| 627 | 628 |
| 628 // Provide the browser process with current renderer framerate. | 629 // Provide the browser process with current renderer framerate. |
| 629 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, | 630 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, |
| 630 int /* routing id */, | 631 int /* routing id */, |
| 631 float /* frames per second */) | 632 float /* frames per second */) |
| OLD | NEW |