| 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 <stdint.h> | 6 #include <stdint.h> |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
| 13 #include "base/memory/shared_memory.h" | 13 #include "base/memory/shared_memory.h" |
| 14 #include "base/process/process.h" | 14 #include "base/process/process.h" |
| 15 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
| 16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
| 17 #include "base/time/time.h" |
| 17 #include "base/values.h" | 18 #include "base/values.h" |
| 18 #include "build/build_config.h" | 19 #include "build/build_config.h" |
| 19 #include "chrome/common/common_param_traits.h" | 20 #include "chrome/common/common_param_traits.h" |
| 20 #include "chrome/common/instant_types.h" | 21 #include "chrome/common/instant_types.h" |
| 21 #include "chrome/common/ntp_logging_events.h" | 22 #include "chrome/common/ntp_logging_events.h" |
| 22 #include "chrome/common/omnibox_focus_state.h" | 23 #include "chrome/common/omnibox_focus_state.h" |
| 23 #include "chrome/common/search_provider.h" | 24 #include "chrome/common/search_provider.h" |
| 24 #include "chrome/common/web_application_info.h" | 25 #include "chrome/common/web_application_info.h" |
| 25 #include "components/content_settings/core/common/content_settings.h" | 26 #include "components/content_settings/core/common/content_settings.h" |
| 26 #include "components/content_settings/core/common/content_settings_pattern.h" | 27 #include "components/content_settings/core/common/content_settings_pattern.h" |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 | 585 |
| 585 #if defined(OS_ANDROID) | 586 #if defined(OS_ANDROID) |
| 586 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DidRetrieveMetaTagContent, | 587 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DidRetrieveMetaTagContent, |
| 587 bool /* success */, | 588 bool /* success */, |
| 588 std::string /* tag_name */, | 589 std::string /* tag_name */, |
| 589 std::string /* tag_content */, | 590 std::string /* tag_content */, |
| 590 GURL /* expected_url */) | 591 GURL /* expected_url */) |
| 591 #endif // defined(OS_ANDROID) | 592 #endif // defined(OS_ANDROID) |
| 592 | 593 |
| 593 // Logs events from InstantExtended New Tab Pages. | 594 // Logs events from InstantExtended New Tab Pages. |
| 594 IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_LogEvent, | 595 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_LogEvent, |
| 595 int /* page_seq_no */, | 596 int /* page_seq_no */, |
| 596 NTPLoggingEventType /* event */) | 597 NTPLoggingEventType /* event */, |
| 598 base::TimeDelta /* time */) |
| 597 | 599 |
| 598 // Logs an impression on one of the Most Visited tile on the InstantExtended | 600 // Logs an impression on one of the Most Visited tile on the InstantExtended |
| 599 // New Tab Page. | 601 // New Tab Page. |
| 600 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_LogMostVisitedImpression, | 602 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_LogMostVisitedImpression, |
| 601 int /* page_seq_no */, | 603 int /* page_seq_no */, |
| 602 int /* position */, | 604 int /* position */, |
| 603 base::string16 /* provider */) | 605 base::string16 /* provider */) |
| 604 | 606 |
| 605 // Logs a navigation on one of the Most Visited tile on the InstantExtended | 607 // Logs a navigation on one of the Most Visited tile on the InstantExtended |
| 606 // New Tab Page. | 608 // New Tab Page. |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 | 679 |
| 678 // Tells the browser process whether the web page wants the banner to be shown. | 680 // Tells the browser process whether the web page wants the banner to be shown. |
| 679 // This is a reply from ChromeViewMsg_AppBannerPromptRequest. | 681 // This is a reply from ChromeViewMsg_AppBannerPromptRequest. |
| 680 IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_AppBannerPromptReply, | 682 IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_AppBannerPromptReply, |
| 681 int /* request_id */, | 683 int /* request_id */, |
| 682 blink::WebAppBannerPromptReply /* reply */) | 684 blink::WebAppBannerPromptReply /* reply */) |
| 683 | 685 |
| 684 // Sent by the renderer to indicate that a fields trial has been activated. | 686 // Sent by the renderer to indicate that a fields trial has been activated. |
| 685 IPC_MESSAGE_CONTROL1(ChromeViewHostMsg_FieldTrialActivated, | 687 IPC_MESSAGE_CONTROL1(ChromeViewHostMsg_FieldTrialActivated, |
| 686 std::string /* name */) | 688 std::string /* name */) |
| OLD | NEW |