diff options
author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 22:11:09 +0000 |
---|---|---|
committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 22:11:09 +0000 |
commit | 857d4f594cea94c2c168ebd25d4944491f455f95 (patch) | |
tree | 95ec95e6469fda985c802e2d45c2534ef45f2f9a | |
parent | a9ba2ae3365b02fb89e6946de4eb9c2f97c3ea44 (diff) | |
download | chromium_src-857d4f594cea94c2c168ebd25d4944491f455f95.zip chromium_src-857d4f594cea94c2c168ebd25d4944491f455f95.tar.gz chromium_src-857d4f594cea94c2c168ebd25d4944491f455f95.tar.bz2 |
Remove override_encoding from NavigateParams and OpenURLParams.
It's unused and doesn't do anything.
BUG=none
TEST=compiles
Review URL: https://codereview.chromium.org/26606003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228023 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/automation/automation_provider.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/browser_navigator.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/browser_navigator.h | 3 | ||||
-rw-r--r-- | content/public/browser/page_navigator.h | 3 |
4 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index e427920..cc18117 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -598,7 +598,7 @@ void AutomationProvider::OverrideEncoding(int tab_handle, } } else { // There is no UI, Chrome probably runs as Chrome-Frame mode. - // Try to get WebContents and call its override_encoding method. + // Try to get WebContents and call its SetOverrideEncoding method. WebContents* contents = nav->GetWebContents(); if (!contents) return; diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index e12e65f..4c25a8e 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -456,7 +456,6 @@ void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params, nav_params->referrer = params.referrer; nav_params->extra_headers = params.extra_headers; nav_params->disposition = params.disposition; - nav_params->override_encoding = params.override_encoding; nav_params->is_renderer_initiated = params.is_renderer_initiated; nav_params->transferred_global_request_id = params.transferred_global_request_id; diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h index 3d84109..93e5597 100644 --- a/chrome/browser/ui/browser_navigator.h +++ b/chrome/browser/ui/browser_navigator.h @@ -141,9 +141,6 @@ struct NavigateParams { // If non-empty, the new tab is an app tab. std::string extension_app_id; - // If non-empty, the new tab contents encoding is overriden by this value. - std::string override_encoding; - // If non-empty, specifies the desired initial position and size of the // window if |disposition| == NEW_POPUP. // TODO(beng): Figure out if this can be used to create Browser windows diff --git a/content/public/browser/page_navigator.h b/content/public/browser/page_navigator.h index 7a6e788..ac9b716 100644 --- a/content/public/browser/page_navigator.h +++ b/content/public/browser/page_navigator.h @@ -68,9 +68,6 @@ struct CONTENT_EXPORT OpenURLParams { // Whether this navigation is initiated by the renderer process. bool is_renderer_initiated; - // The override encoding of the URL contents to be opened. - std::string override_encoding; - // Reference to the old request id in case this is a navigation that is being // transferred to a new renderer. GlobalRequestID transferred_global_request_id; |