Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: extensions/shell/app_shell.gyp

Issue 468393005: app_shell: Shut down in response to power button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a comment Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/shell/app_shell.gyp
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index e904dfe3406a2b9734ce1f8f4226e983dd976adf..8a656f794f4f29bdd2ffadf8763ad8ce8d05a3fc 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -194,9 +194,11 @@
'<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
'<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
'<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(DEPTH)/ui/aura/aura.gyp:aura_test_support',
],
'sources': [
'../test/extensions_unittests_main.cc',
+ 'browser/shell_desktop_controller_unittest.cc',
'browser/shell_nacl_browser_delegate_unittest.cc',
],
'conditions': [
@@ -205,6 +207,11 @@
'browser/shell_nacl_browser_delegate_unittest.cc',
],
}],
+ ['chromeos==1', {
+ 'dependencies': [
+ '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
+ ],
+ }],
],
},
{

Powered by Google App Engine
This is Rietveld 408576698