summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorjcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 23:12:33 +0000
committerjcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 23:12:33 +0000
commitcfe5c1375a0dafe47ffb4b9223d33253fc01e8fa (patch)
tree15e23a948bbec2ee6b20d9a95645a477279e7bf9 /chrome/chrome_browser.gypi
parentddf8a4b03ca007cc55ead2000aa6b54d0319cd56 (diff)
downloadchromium_src-cfe5c1375a0dafe47ffb4b9223d33253fc01e8fa.zip
chromium_src-cfe5c1375a0dafe47ffb4b9223d33253fc01e8fa.tar.gz
chromium_src-cfe5c1375a0dafe47ffb4b9223d33253fc01e8fa.tar.bz2
Porting the app launcher to Windows, and adding an experimental flag
so the app launcher shows when you open a new tab. Also removing the graying-out of the browser when the app launcher is showng for now, as it is not clear how to make it cross-platform. BUG=None TEST=Start Chrome with --app-launcher-new-tab. Opening a new tab should bring the app launcher (still a prototype at this point). Review URL: http://codereview.chromium.org/1145001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rwxr-xr-xchrome/chrome_browser.gypi6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index acbd591..bebf2c8 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -304,8 +304,6 @@
'browser/chrome_plugin_host.h',
'browser/chrome_thread.cc',
'browser/chrome_thread.h',
- 'browser/chromeos/app_launcher.h',
- 'browser/chromeos/app_launcher.cc',
'browser/chromeos/notifications/balloon_collection_impl.h',
'browser/chromeos/notifications/balloon_collection_impl.cc',
'browser/chromeos/notifications/balloon_view.h',
@@ -2042,6 +2040,8 @@
'browser/views/accelerator_table_gtk.h',
'browser/views/accessible_toolbar_view.cc',
'browser/views/accessible_toolbar_view.h',
+ 'browser/views/app_launcher.cc',
+ 'browser/views/app_launcher.h',
'browser/views/appcache_info_view.cc',
'browser/views/appcache_info_view.h',
'browser/views/autocomplete/autocomplete_popup_contents_view.cc',
@@ -2678,6 +2678,8 @@
['include', '^browser/views/accelerator_table_gtk.h'],
['include', '^browser/views/accessible_toolbar_view.cc'],
['include', '^browser/views/accessible_toolbar_view.h'],
+ ['include', '^browser/views/app_launcher.cc'],
+ ['include', '^browser/views/app_launcher.h'],
['include', '^browser/views/autocomplete/autocomplete_popup_contents_view.cc'],
['include', '^browser/views/autocomplete/autocomplete_popup_contents_view.h'],
['include', '^browser/views/autocomplete/autocomplete_popup_gtk.cc'],