diff options
| author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 00:25:31 +0000 |
|---|---|---|
| committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 00:25:31 +0000 |
| commit | 331b803f65e8f994f9148024e8c2be6b465c6a6e (patch) | |
| tree | 6d35dc03a2b3c06702b72fb67ac2e9d2124c16a8 /content/content_browser.gypi | |
| parent | dbebd42a9160a35acae341101e028fddefac93d4 (diff) | |
| download | chromium_src-331b803f65e8f994f9148024e8c2be6b465c6a6e.zip chromium_src-331b803f65e8f994f9148024e8c2be6b465c6a6e.tar.gz chromium_src-331b803f65e8f994f9148024e8c2be6b465c6a6e.tar.bz2 | |
Revert 146000 - Split out ContentViewCore from ContentView for embedders.
Some embedders do not want the additional view added by using ContentView,
so we are splitting out ContentViewCore so the functionality can be used
without forcing an additional FrameLayout.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10704049
TBR=tedchoc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10693134
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browser.gypi')
| -rw-r--r-- | content/content_browser.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 37ab59f..513a7b0 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -30,7 +30,6 @@ 'port/browser/render_view_host_delegate_view.h', 'port/browser/render_widget_host_view_port.h', 'public/browser/access_token_store.h', - 'public/browser/android/content_view_core.h', 'public/browser/browser_accessibility_state.h', 'public/browser/browser_child_process_host.h', 'public/browser/browser_child_process_host_delegate.cc', @@ -54,6 +53,7 @@ 'public/browser/content_browser_client.cc', 'public/browser/content_browser_client.h', 'public/browser/content_ipc_logging.h', + 'public/browser/android/content_view.h', 'public/browser/devtools_agent_host_registry.h', 'public/browser/devtools_client_host.h', 'public/browser/download_danger_type.h', @@ -198,8 +198,8 @@ 'browser/android/content_util.h', 'browser/android/content_view_client.cc', 'browser/android/content_view_client.h', - 'browser/android/content_view_core_impl.cc', - 'browser/android/content_view_core_impl.h', + 'browser/android/content_view_impl.cc', + 'browser/android/content_view_impl.h', 'browser/android/download_controller.cc', 'browser/android/download_controller.h', 'browser/android/ime_utils.cc', |