summaryrefslogtreecommitdiffstats
path: root/ios/provider
diff options
context:
space:
mode:
authordroger <droger@chromium.org>2014-12-08 02:44:24 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-08 10:44:39 +0000
commit5662df670706ad5b29689b809005f7c985b18d20 (patch)
treec24228dd6f43b9e8f6a1ddfb01a51a47b985ab9c /ios/provider
parent631db4a9227a66f9520d23f96d02af5bfebabbd9 (diff)
downloadchromium_src-5662df670706ad5b29689b809005f7c985b18d20.zip
chromium_src-5662df670706ad5b29689b809005f7c985b18d20.tar.gz
chromium_src-5662df670706ad5b29689b809005f7c985b18d20.tar.bz2
Upstream iOS web API.
This CL upstreams NavigationManager, WebState and WebStateUserData to match the downstream code. Review URL: https://codereview.chromium.org/777183002 Cr-Commit-Position: refs/heads/master@{#307218}
Diffstat (limited to 'ios/provider')
-rw-r--r--ios/provider/ios_provider_chrome.gyp1
-rw-r--r--ios/provider/ios_provider_web.gyp24
2 files changed, 0 insertions, 25 deletions
diff --git a/ios/provider/ios_provider_chrome.gyp b/ios/provider/ios_provider_chrome.gyp
index eb8e1f1..dab2785 100644
--- a/ios/provider/ios_provider_chrome.gyp
+++ b/ios/provider/ios_provider_chrome.gyp
@@ -15,7 +15,6 @@
],
'dependencies': [
'../../base/base.gyp:base',
- 'ios_provider_web.gyp:ios_provider_web',
],
},
],
diff --git a/ios/provider/ios_provider_web.gyp b/ios/provider/ios_provider_web.gyp
deleted file mode 100644
index df72fb7..0000000
--- a/ios/provider/ios_provider_web.gyp
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2014 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.
-{
- 'variables': {
- 'chromium_code': 1,
- },
- 'targets': [
- {
- 'target_name': 'ios_provider_web',
- 'type': 'none',
- 'include_dirs': [
- '../..',
- ],
- 'sources': [
- '../public/provider/web/web_state.h',
- '../public/provider/web/web_state_user_data.h',
- ],
- 'dependencies': [
- '../ios_base.gyp:ios_consumer_base',
- ],
- },
- ],
-}