diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 22:28:17 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 22:28:17 +0000 |
commit | c1b9358a8da97ae7ed352a0ae05d3feb963eb3e2 (patch) | |
tree | 1684df118bce5051b27487adfb5d3c61f6cf2a03 | |
parent | 2c9eafa9469bc77f1a3ecda8af5d6c8b75582b98 (diff) | |
download | chromium_src-c1b9358a8da97ae7ed352a0ae05d3feb963eb3e2.zip chromium_src-c1b9358a8da97ae7ed352a0ae05d3feb963eb3e2.tar.gz chromium_src-c1b9358a8da97ae7ed352a0ae05d3feb963eb3e2.tar.bz2 |
Android: Remove web_navigation extensions API.
BUG=305852
Review URL: https://codereview.chromium.org/351673004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279520 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 2 insertions, 13 deletions
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc index becb1ab..d8e6c7c 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc @@ -85,9 +85,7 @@ bool FrameNavigationState::IsValidUrl(const GURL& url) const { url.spec() == content::kAboutSrcDocURL) { return true; } - if (allow_extension_scheme_ && url.scheme() == extensions::kExtensionScheme) - return true; - return false; + return allow_extension_scheme_ && url.scheme() == kExtensionScheme; } void FrameNavigationState::TrackFrame(FrameID frame_id, @@ -109,7 +107,7 @@ void FrameNavigationState::TrackFrame(FrameID frame_id, if (!is_main_frame) { frame_state.parent_frame_num = parent_frame_id.frame_num; } else { - DCHECK(parent_frame_id.frame_num == -1); + DCHECK_EQ(-1, parent_frame_id.frame_num); frame_state.parent_frame_num = -1; } frame_ids_.insert(frame_id); diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index bbade50..b85fcb9 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -36,8 +36,6 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::WebNavigationTabObserver); namespace extensions { -#if !defined(OS_ANDROID) - namespace helpers = web_navigation_api_helpers; namespace keys = web_navigation_api_constants; namespace web_navigation = api::web_navigation; @@ -841,6 +839,4 @@ void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) { EventRouter::Get(browser_context_)->UnregisterObserver(this); } -#endif // OS_ANDROID - } // namespace extensions diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index f0d24fc..d71a68e 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -1056,10 +1056,6 @@ ['include', '^browser/extensions/api/proxy/proxy_api_constants.cc'], ['include', '^browser/extensions/api/runtime/chrome_runtime_api_delegate.cc'], ['include', '^browser/extensions/api/tabs/tabs_constants.cc'], - ['include', '^browser/extensions/api/web_navigation/frame_navigation_state.cc'], - ['include', '^browser/extensions/api/web_navigation/web_navigation_api.cc'], - ['include', '^browser/extensions/api/web_navigation/web_navigation_api_constants.cc'], - ['include', '^browser/extensions/api/web_navigation/web_navigation_api_helpers.cc'], ], 'dependencies!': [ '../device/bluetooth/bluetooth.gyp:device_bluetooth', diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp index 014fdfd..3f3fde9 100644 --- a/chrome/common/extensions/api/api.gyp +++ b/chrome/common/extensions/api/api.gyp @@ -23,7 +23,6 @@ 'tab_capture.idl', 'tabs.json', 'types.json', - 'web_navigation.json', 'windows.json', ], |