Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: content/common/frame_messages.h

Issue 2684093002: Rename JavaScript "messages" to "dialogs". (Closed)
Patch Set: win fox Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 // IPC messages for interacting with frames. 5 // IPC messages for interacting with frames.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 17 matching lines...) Expand all
28 #include "content/common/navigation_params.h" 28 #include "content/common/navigation_params.h"
29 #include "content/common/savable_subframe.h" 29 #include "content/common/savable_subframe.h"
30 #include "content/public/common/color_suggestion.h" 30 #include "content/public/common/color_suggestion.h"
31 #include "content/public/common/common_param_traits.h" 31 #include "content/public/common/common_param_traits.h"
32 #include "content/public/common/console_message_level.h" 32 #include "content/public/common/console_message_level.h"
33 #include "content/public/common/context_menu_params.h" 33 #include "content/public/common/context_menu_params.h"
34 #include "content/public/common/file_chooser_file_info.h" 34 #include "content/public/common/file_chooser_file_info.h"
35 #include "content/public/common/file_chooser_params.h" 35 #include "content/public/common/file_chooser_params.h"
36 #include "content/public/common/form_field_data.h" 36 #include "content/public/common/form_field_data.h"
37 #include "content/public/common/frame_navigate_params.h" 37 #include "content/public/common/frame_navigate_params.h"
38 #include "content/public/common/javascript_message_type.h" 38 #include "content/public/common/javascript_dialog_type.h"
39 #include "content/public/common/page_importance_signals.h" 39 #include "content/public/common/page_importance_signals.h"
40 #include "content/public/common/page_state.h" 40 #include "content/public/common/page_state.h"
41 #include "content/public/common/previews_state.h" 41 #include "content/public/common/previews_state.h"
42 #include "content/public/common/referrer.h" 42 #include "content/public/common/referrer.h"
43 #include "content/public/common/resource_response.h" 43 #include "content/public/common/resource_response.h"
44 #include "content/public/common/stop_find_action.h" 44 #include "content/public/common/stop_find_action.h"
45 #include "content/public/common/three_d_api_types.h" 45 #include "content/public/common/three_d_api_types.h"
46 #include "ipc/ipc_message_macros.h" 46 #include "ipc/ipc_message_macros.h"
47 #include "ipc/ipc_platform_file.h" 47 #include "ipc/ipc_platform_file.h"
48 #include "ppapi/features/features.h" 48 #include "ppapi/features/features.h"
(...skipping 27 matching lines...) Expand all
76 using FrameMsg_SerializeAsMHTML_FrameRoutingIdToContentIdMap = 76 using FrameMsg_SerializeAsMHTML_FrameRoutingIdToContentIdMap =
77 std::map<int, std::string>; 77 std::map<int, std::string>;
78 78
79 #endif // CONTENT_COMMON_FRAME_MESSAGES_H_ 79 #endif // CONTENT_COMMON_FRAME_MESSAGES_H_
80 80
81 #undef IPC_MESSAGE_EXPORT 81 #undef IPC_MESSAGE_EXPORT
82 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT 82 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
83 83
84 #define IPC_MESSAGE_START FrameMsgStart 84 #define IPC_MESSAGE_START FrameMsgStart
85 85
86 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::JavaScriptMessageType, 86 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::JavaScriptDialogType,
87 content::JAVASCRIPT_MESSAGE_TYPE_ALERT, 87 content::JAVASCRIPT_DIALOG_TYPE_ALERT,
88 content::JAVASCRIPT_MESSAGE_TYPE_PROMPT) 88 content::JAVASCRIPT_DIALOG_TYPE_PROMPT)
89 IPC_ENUM_TRAITS_MAX_VALUE(FrameMsg_Navigate_Type::Value, 89 IPC_ENUM_TRAITS_MAX_VALUE(FrameMsg_Navigate_Type::Value,
90 FrameMsg_Navigate_Type::NAVIGATE_TYPE_LAST) 90 FrameMsg_Navigate_Type::NAVIGATE_TYPE_LAST)
91 IPC_ENUM_TRAITS_MAX_VALUE(FrameMsg_UILoadMetricsReportType::Value, 91 IPC_ENUM_TRAITS_MAX_VALUE(FrameMsg_UILoadMetricsReportType::Value,
92 FrameMsg_UILoadMetricsReportType::REPORT_TYPE_LAST) 92 FrameMsg_UILoadMetricsReportType::REPORT_TYPE_LAST)
93 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContextMenuData::MediaType, 93 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContextMenuData::MediaType,
94 blink::WebContextMenuData::MediaTypeLast) 94 blink::WebContextMenuData::MediaTypeLast)
95 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContextMenuData::InputFieldType, 95 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContextMenuData::InputFieldType,
96 blink::WebContextMenuData::InputFieldTypeLast) 96 blink::WebContextMenuData::InputFieldTypeLast)
97 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebFocusType, blink::WebFocusTypeLast) 97 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebFocusType, blink::WebFocusTypeLast)
98 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebFrameOwnerProperties::ScrollingMode, 98 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebFrameOwnerProperties::ScrollingMode,
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 // Response for FrameMsg_JavaScriptExecuteRequest, sent when a reply was 1361 // Response for FrameMsg_JavaScriptExecuteRequest, sent when a reply was
1362 // requested. The ID is the parameter supplied to 1362 // requested. The ID is the parameter supplied to
1363 // FrameMsg_JavaScriptExecuteRequest. The result has the value returned by the 1363 // FrameMsg_JavaScriptExecuteRequest. The result has the value returned by the
1364 // script as its only element, one of Null, Boolean, Integer, Real, Date, or 1364 // script as its only element, one of Null, Boolean, Integer, Real, Date, or
1365 // String. 1365 // String.
1366 IPC_MESSAGE_ROUTED2(FrameHostMsg_JavaScriptExecuteResponse, 1366 IPC_MESSAGE_ROUTED2(FrameHostMsg_JavaScriptExecuteResponse,
1367 int /* id */, 1367 int /* id */,
1368 base::ListValue /* result */) 1368 base::ListValue /* result */)
1369 1369
1370 // A request to run a JavaScript dialog. 1370 // A request to run a JavaScript dialog.
1371 IPC_SYNC_MESSAGE_ROUTED4_2(FrameHostMsg_RunJavaScriptMessage, 1371 IPC_SYNC_MESSAGE_ROUTED4_2(FrameHostMsg_RunJavaScriptDialog,
1372 base::string16 /* in - alert message */, 1372 base::string16 /* in - alert message */,
1373 base::string16 /* in - default prompt */, 1373 base::string16 /* in - default prompt */,
1374 GURL /* in - originating page URL */, 1374 GURL /* in - originating page URL */,
1375 content::JavaScriptMessageType /* in - type */, 1375 content::JavaScriptDialogType /* in - type */,
1376 bool /* out - success */, 1376 bool /* out - success */,
1377 base::string16 /* out - user_input field */) 1377 base::string16 /* out - user_input field */)
1378 1378
1379 // Displays a dialog to confirm that the user wants to navigate away from the 1379 // Displays a dialog to confirm that the user wants to navigate away from the
1380 // page. Replies true if yes, and false otherwise. The reply string is ignored, 1380 // page. Replies true if yes, and false otherwise. The reply string is ignored,
1381 // but is included so that we can use OnJavaScriptMessageBoxClosed. 1381 // but is included so that we can use OnJavaScriptMessageBoxClosed.
1382 IPC_SYNC_MESSAGE_ROUTED2_2(FrameHostMsg_RunBeforeUnloadConfirm, 1382 IPC_SYNC_MESSAGE_ROUTED2_2(FrameHostMsg_RunBeforeUnloadConfirm,
1383 GURL, /* in - originating frame URL */ 1383 GURL, /* in - originating frame URL */
1384 bool /* in - is a reload */, 1384 bool /* in - is a reload */,
1385 bool /* out - success */, 1385 bool /* out - success */,
1386 base::string16 /* out - This is ignored.*/) 1386 base::string16 /* out - This is ignored.*/)
1387 1387
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 // nearest find result in the sending frame. 1577 // nearest find result in the sending frame.
1578 IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply, 1578 IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply,
1579 int /* nfr_request_id */, 1579 int /* nfr_request_id */,
1580 float /* distance */) 1580 float /* distance */)
1581 #endif 1581 #endif
1582 1582
1583 // Adding a new message? Stick to the sort order above: first platform 1583 // Adding a new message? Stick to the sort order above: first platform
1584 // independent FrameMsg, then ifdefs for platform specific FrameMsg, then 1584 // independent FrameMsg, then ifdefs for platform specific FrameMsg, then
1585 // platform independent FrameHostMsg, then ifdefs for platform specific 1585 // platform independent FrameHostMsg, then ifdefs for platform specific
1586 // FrameHostMsg. 1586 // FrameHostMsg.
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl_unittest.cc ('k') | content/public/browser/javascript_dialog_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698