diff options
author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 20:53:27 +0000 |
---|---|---|
committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 20:53:27 +0000 |
commit | 17eae598cc52d3cd95597c07dc35469369c59010 (patch) | |
tree | d8819cf216863ddcf94928ae647ab566016c7b71 /content/content_shell.gypi | |
parent | 4b2f65784504669a14cf7d93a9b97bcc81ab62a3 (diff) | |
download | chromium_src-17eae598cc52d3cd95597c07dc35469369c59010.zip chromium_src-17eae598cc52d3cd95597c07dc35469369c59010.tar.gz chromium_src-17eae598cc52d3cd95597c07dc35469369c59010.tar.bz2 |
Move MinimalShell to ui/shell.
Move the MinimalShell class from content to a new "shell"
library so it can be shared by app_shell. Also move
aura::test::TestActivationClient to
aura::client::DefaultActivationClient.
BUG=305404
Review URL: https://codereview.chromium.org/26699003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
-rw-r--r-- | content/content_shell.gypi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 6485682..efd102f 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -77,8 +77,6 @@ 'shell/app/webkit_test_platform_support_linux.cc', 'shell/app/webkit_test_platform_support_mac.mm', 'shell/app/webkit_test_platform_support_win.cc', - 'shell/browser/minimal_shell.cc', - 'shell/browser/minimal_shell.h', 'shell/browser/notify_done_forwarder.cc', 'shell/browser/notify_done_forwarder.h', 'shell/browser/shell_android.cc', @@ -233,6 +231,7 @@ ['chromeos==1', { 'dependencies': [ '../chromeos/chromeos.gyp:chromeos', + '../ui/shell/shell.gyp:shell', ], }], # chromeos==1 ['use_ash==1', { |