Index: chrome/common/render_messages.h |
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h |
index d7b4751b61fbce17c8d40df5649b25280d85f3ed..0f7a97bc96f9b1a8ca4ca6c53524c1c58a9b2f66 100644 |
--- a/chrome/common/render_messages.h |
+++ b/chrome/common/render_messages.h |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -19,10 +19,8 @@ |
#include "chrome/common/common_param_traits.h" |
#include "chrome/common/content_settings.h" |
#include "chrome/common/content_settings_pattern.h" |
-#include "chrome/common/instant_types.h" |
#include "chrome/common/nacl_types.h" |
#include "chrome/common/search_provider.h" |
-#include "chrome/common/search_types.h" |
#include "chrome/common/translate_errors.h" |
#include "content/public/common/common_param_traits.h" |
#include "ipc/ipc_channel_handle.h" |
@@ -31,8 +29,6 @@ |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" |
-#include "ui/base/window_open_disposition.h" |
-#include "ui/gfx/rect.h" |
// Singly-included section for enums and custom IPC traits. |
#ifndef CHROME_COMMON_RENDER_MESSAGES_H_ |
@@ -115,14 +111,8 @@ struct ParamTraits<ContentSettingsPattern> { |
#define IPC_MESSAGE_START ChromeMsgStart |
IPC_ENUM_TRAITS(ChromeViewHostMsg_GetPluginInfo_Status::Value) |
-IPC_ENUM_TRAITS(InstantCompleteBehavior) |
-IPC_ENUM_TRAITS(InstantSizeUnits) |
-IPC_ENUM_TRAITS(InstantSuggestionType) |
-IPC_ENUM_TRAITS(InstantShownReason) |
IPC_ENUM_TRAITS(search_provider::OSDDType) |
IPC_ENUM_TRAITS(search_provider::InstallState) |
-IPC_ENUM_TRAITS(ThemeBackgroundImageAlignment) |
-IPC_ENUM_TRAITS(ThemeBackgroundImageTiling) |
IPC_ENUM_TRAITS(TranslateErrors::Type) |
IPC_ENUM_TRAITS(WebKit::WebConsoleMessage::Level) |
@@ -158,33 +148,6 @@ IPC_STRUCT_TRAITS_BEGIN(ContentSettingPatternSource) |
IPC_STRUCT_TRAITS_MEMBER(incognito) |
IPC_STRUCT_TRAITS_END() |
-IPC_STRUCT_TRAITS_BEGIN(InstantAutocompleteResult) |
- IPC_STRUCT_TRAITS_MEMBER(provider) |
- IPC_STRUCT_TRAITS_MEMBER(type) |
- IPC_STRUCT_TRAITS_MEMBER(description) |
- IPC_STRUCT_TRAITS_MEMBER(destination_url) |
- IPC_STRUCT_TRAITS_MEMBER(transition) |
- IPC_STRUCT_TRAITS_MEMBER(relevance) |
-IPC_STRUCT_TRAITS_END() |
- |
-IPC_STRUCT_TRAITS_BEGIN(MostVisitedItem) |
- IPC_STRUCT_TRAITS_MEMBER(url) |
- IPC_STRUCT_TRAITS_MEMBER(title) |
-IPC_STRUCT_TRAITS_END() |
- |
-IPC_STRUCT_TRAITS_BEGIN(InstantSuggestion) |
- IPC_STRUCT_TRAITS_MEMBER(text) |
- IPC_STRUCT_TRAITS_MEMBER(behavior) |
- IPC_STRUCT_TRAITS_MEMBER(type) |
-IPC_STRUCT_TRAITS_END() |
- |
-IPC_ENUM_TRAITS(chrome::search::Mode::Type) |
-IPC_ENUM_TRAITS(chrome::search::Mode::Origin) |
-IPC_STRUCT_TRAITS_BEGIN(chrome::search::Mode) |
- IPC_STRUCT_TRAITS_MEMBER(mode) |
- IPC_STRUCT_TRAITS_MEMBER(origin) |
-IPC_STRUCT_TRAITS_END() |
- |
IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) |
IPC_STRUCT_TRAITS_MEMBER(manifest_url) |
IPC_STRUCT_TRAITS_MEMBER(render_view_id) |
@@ -197,18 +160,6 @@ IPC_STRUCT_TRAITS_BEGIN(RendererContentSettingRules) |
IPC_STRUCT_TRAITS_MEMBER(script_rules) |
IPC_STRUCT_TRAITS_END() |
-IPC_STRUCT_TRAITS_BEGIN(ThemeBackgroundInfo) |
- IPC_STRUCT_TRAITS_MEMBER(color_r) |
- IPC_STRUCT_TRAITS_MEMBER(color_g) |
- IPC_STRUCT_TRAITS_MEMBER(color_b) |
- IPC_STRUCT_TRAITS_MEMBER(color_a) |
- IPC_STRUCT_TRAITS_MEMBER(theme_id) |
- IPC_STRUCT_TRAITS_MEMBER(image_horizontal_alignment) |
- IPC_STRUCT_TRAITS_MEMBER(image_vertical_alignment) |
- IPC_STRUCT_TRAITS_MEMBER(image_tiling) |
- IPC_STRUCT_TRAITS_MEMBER(image_height) |
-IPC_STRUCT_TRAITS_END() |
- |
IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCache::ResourceTypeStat) |
IPC_STRUCT_TRAITS_MEMBER(count) |
IPC_STRUCT_TRAITS_MEMBER(size) |
@@ -292,67 +243,6 @@ IPC_MESSAGE_ROUTED3(ChromeViewMsg_HandleMessageFromExternalHost, |
std::string /* The origin */, |
std::string /* The target*/) |
-IPC_MESSAGE_ROUTED4(ChromeViewMsg_SearchBoxChange, |
- string16 /* value */, |
- bool /* verbatim */, |
- size_t /* selection_start */, |
- size_t /* selection_end */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxSubmit, |
- string16 /* value */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxCancel, |
- string16 /* value */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxPopupResize, |
- gfx::Rect /* bounds */) |
- |
-IPC_MESSAGE_ROUTED2(ChromeViewMsg_SearchBoxMarginChange, |
- int /* start */, |
- int /* end */) |
- |
-IPC_MESSAGE_ROUTED0(ChromeViewMsg_DetermineIfPageSupportsInstant) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxAutocompleteResults, |
- std::vector<InstantAutocompleteResult> |
- /* native_suggestions */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxUpOrDownKeyPressed, |
- int /* count */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxCancelSelection, |
- string16 /* value */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxModeChanged, |
- chrome::search::Mode /* mode */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxSetDisplayInstantResults, |
- bool /* display_instant_results */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxThemeChanged, |
- ThemeBackgroundInfo /* value */) |
- |
-IPC_MESSAGE_ROUTED2(ChromeViewMsg_SearchBoxFontInformation, |
- string16 /* omnibox_font */, |
- size_t /* omnibox_font_size */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxKeyCaptureChanged, |
- bool /* is_key_capture_enabled */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SearchBoxGrantChromeSearchAccessFromOrigin, |
- GURL /* origin_url */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_InstantMostVisitedItemsChanged, |
- std::vector<MostVisitedItem> /* items */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_InstantDeleteMostVisitedItem, |
- GURL /* url */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_InstantUndoMostVisitedDeletion, |
- GURL /* url */) |
- |
-IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_InstantUndoAllMostVisitedDeletions) |
- |
// Toggles visual muting of the render view area. This is on when a constrained |
// window is showing. |
IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetVisuallyDeemphasized, |
@@ -668,42 +558,6 @@ IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_DidBlockRunningInsecureContent) |
IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_FocusedNodeTouched, |
bool /* editable */) |
-// Suggest results ----------------------------------------------------------- |
- |
-// Sent by Instant to populate the omnibox with query suggestions. |
-IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_SetSuggestions, |
- int /* page_id */, |
- std::vector<InstantSuggestion> /* suggestions */) |
- |
-// Sent by Instant to indicate whether the page supports the Instant API |
-// (http://dev.chromium.org/searchbox). |
-IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_InstantSupportDetermined, |
- int /* page_id */, |
- bool /* result */) |
- |
-IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_SearchBoxNavigate, |
- int /* page_id */, |
- GURL /* destination */, |
- content::PageTransition /* transition */, |
- WindowOpenDisposition /* disposition */) |
- |
-// Sent by the Instant overlay asking to show itself with the given height. |
-IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_ShowInstantOverlay, |
- int /* page_id */, |
- InstantShownReason /* reason */, |
- int /* height */, |
- InstantSizeUnits /* units */) |
- |
-// Sent by Instant to focus the omnibox. |
-IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_FocusOmnibox, |
- int /* page_id */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_StartCapturingKeyStrokes, |
- int /* page_id */) |
- |
-IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_StopCapturingKeyStrokes, |
- int /* page_id */) |
- |
// The currently displayed PDF has an unsupported feature. |
IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_PDFHasUnsupportedFeature) |