| 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 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 13 #include "base/process.h" | 13 #include "base/process.h" |
| 14 #include "base/shared_memory.h" | 14 #include "base/shared_memory.h" |
| 15 #include "base/string16.h" | 15 #include "base/string16.h" |
| 16 #include "base/stringprintf.h" | 16 #include "base/stringprintf.h" |
| 17 #include "base/values.h" | 17 #include "base/values.h" |
| 18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
| 19 #include "chrome/common/common_param_traits.h" | 19 #include "chrome/common/common_param_traits.h" |
| 20 #include "chrome/common/content_settings.h" | 20 #include "chrome/common/content_settings.h" |
| 21 #include "chrome/common/content_settings_pattern.h" | 21 #include "chrome/common/content_settings_pattern.h" |
| 22 #include "chrome/common/instant_types.h" | 22 #include "chrome/common/instant_types.h" |
| 23 #include "chrome/common/nacl_types.h" | 23 #include "chrome/common/nacl_types.h" |
| 24 #include "chrome/common/search_provider.h" | 24 #include "chrome/common/search_provider.h" |
| 25 #include "chrome/common/search_types.h" | 25 #include "chrome/common/search_types.h" |
| 26 #include "chrome/common/translate_errors.h" | 26 #include "chrome/common/translate_errors.h" |
| 27 #include "content/public/common/common_param_traits.h" | 27 #include "content/public/common/common_param_traits.h" |
| 28 #include "content/public/common/page_transition_types.h" |
| 28 #include "ipc/ipc_channel_handle.h" | 29 #include "ipc/ipc_channel_handle.h" |
| 29 #include "ipc/ipc_message_macros.h" | 30 #include "ipc/ipc_message_macros.h" |
| 30 #include "ipc/ipc_platform_file.h" | 31 #include "ipc/ipc_platform_file.h" |
| 31 #include "third_party/skia/include/core/SkBitmap.h" | 32 #include "third_party/skia/include/core/SkBitmap.h" |
| 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" |
| 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" |
| 34 #include "ui/gfx/rect.h" | 35 #include "ui/gfx/rect.h" |
| 35 | 36 |
| 36 // Singly-included section for enums and custom IPC traits. | 37 // Singly-included section for enums and custom IPC traits. |
| 37 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_ | 38 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_ |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 107 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 107 static void Log(const param_type& p, std::string* l); | 108 static void Log(const param_type& p, std::string* l); |
| 108 }; | 109 }; |
| 109 | 110 |
| 110 } // namespace IPC | 111 } // namespace IPC |
| 111 | 112 |
| 112 #endif // CHROME_COMMON_RENDER_MESSAGES_H_ | 113 #endif // CHROME_COMMON_RENDER_MESSAGES_H_ |
| 113 | 114 |
| 114 #define IPC_MESSAGE_START ChromeMsgStart | 115 #define IPC_MESSAGE_START ChromeMsgStart |
| 115 | 116 |
| 117 IPC_ENUM_TRAITS(content::PageTransition); |
| 116 IPC_ENUM_TRAITS(ChromeViewHostMsg_GetPluginInfo_Status::Value) | 118 IPC_ENUM_TRAITS(ChromeViewHostMsg_GetPluginInfo_Status::Value) |
| 117 IPC_ENUM_TRAITS(InstantCompleteBehavior) | 119 IPC_ENUM_TRAITS(InstantCompleteBehavior) |
| 118 IPC_ENUM_TRAITS(InstantSizeUnits) | 120 IPC_ENUM_TRAITS(InstantSizeUnits) |
| 119 IPC_ENUM_TRAITS(InstantSuggestionType) | 121 IPC_ENUM_TRAITS(InstantSuggestionType) |
| 120 IPC_ENUM_TRAITS(InstantShownReason) | 122 IPC_ENUM_TRAITS(InstantShownReason) |
| 121 IPC_ENUM_TRAITS(search_provider::OSDDType) | 123 IPC_ENUM_TRAITS(search_provider::OSDDType) |
| 122 IPC_ENUM_TRAITS(search_provider::InstallState) | 124 IPC_ENUM_TRAITS(search_provider::InstallState) |
| 123 IPC_ENUM_TRAITS(ThemeBackgroundImageAlignment) | 125 IPC_ENUM_TRAITS(ThemeBackgroundImageAlignment) |
| 124 IPC_ENUM_TRAITS(ThemeBackgroundImageTiling) | 126 IPC_ENUM_TRAITS(ThemeBackgroundImageTiling) |
| 125 IPC_ENUM_TRAITS(TranslateErrors::Type) | 127 IPC_ENUM_TRAITS(TranslateErrors::Type) |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_SetSuggestions, | 650 IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_SetSuggestions, |
| 649 int /* page_id */, | 651 int /* page_id */, |
| 650 std::vector<InstantSuggestion> /* suggestions */) | 652 std::vector<InstantSuggestion> /* suggestions */) |
| 651 | 653 |
| 652 // Sent by the Instant preview indicating whether the page supports the Instant | 654 // Sent by the Instant preview indicating whether the page supports the Instant |
| 653 // API or not (http://dev.chromium.org/searchbox). | 655 // API or not (http://dev.chromium.org/searchbox). |
| 654 IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_InstantSupportDetermined, | 656 IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_InstantSupportDetermined, |
| 655 int /* page_id */, | 657 int /* page_id */, |
| 656 bool /* result */) | 658 bool /* result */) |
| 657 | 659 |
| 660 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_SearchBoxNavigate, |
| 661 int /* page_id */, |
| 662 GURL /* destination */, |
| 663 content::PageTransition /* transition */); |
| 664 |
| 658 // Sent by the Instant preview asking to show itself with the given height. | 665 // Sent by the Instant preview asking to show itself with the given height. |
| 659 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_ShowInstantPreview, | 666 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_ShowInstantPreview, |
| 660 int /* page_id */, | 667 int /* page_id */, |
| 661 InstantShownReason /* reason */, | 668 InstantShownReason /* reason */, |
| 662 int /* height */, | 669 int /* height */, |
| 663 InstantSizeUnits /* units */) | 670 InstantSizeUnits /* units */) |
| 664 | 671 |
| 665 IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_StartCapturingKeyStrokes, | 672 IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_StartCapturingKeyStrokes, |
| 666 int /* page_id */) | 673 int /* page_id */) |
| 667 | 674 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 691 // previous SetCookie message to be processed. | 698 // previous SetCookie message to be processed. |
| 692 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, | 699 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, |
| 693 GURL /* url */, | 700 GURL /* url */, |
| 694 GURL /* first_party_for_cookies */, | 701 GURL /* first_party_for_cookies */, |
| 695 std::string /* cookies */) | 702 std::string /* cookies */) |
| 696 | 703 |
| 697 // Provide the browser process with current renderer framerate. | 704 // Provide the browser process with current renderer framerate. |
| 698 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, | 705 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, |
| 699 int /* routing id */, | 706 int /* routing id */, |
| 700 float /* frames per second */) | 707 float /* frames per second */) |
| OLD | NEW |