diff options
author | samli <samli@chromium.org> | 2016-01-19 19:44:56 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-20 03:46:11 +0000 |
commit | 0e3a9fd80a26f1fce889200d330d79e64d7a2586 (patch) | |
tree | b81e8346effefb053d8ad102efd2a31c0507bd13 /chrome/chrome_browser_ui.gypi | |
parent | 15d94b7c0e0b17e973d144c03c7f69f9e0f62309 (diff) | |
download | chromium_src-0e3a9fd80a26f1fce889200d330d79e64d7a2586.zip chromium_src-0e3a9fd80a26f1fce889200d330d79e64d7a2586.tar.gz chromium_src-0e3a9fd80a26f1fce889200d330d79e64d7a2586.tar.bz2 |
Revert of Remove remote tree host and some related input and metro_driver code (patchset #5 id:80001 of https://codereview.chromium.org/1586843002/ )
Reason for revert:
Suspecting that this is breaking the Webkit Win (dbg) builder.
First failed build:
https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder%20%28dbg%29/builds/88362
Original issue's description:
> Remove remote tree host and some related input and metro_driver code
>
> Part of continued stripping out of Metro/Win8/Immersive mode.
>
> BUG=558054
>
> Committed: https://crrev.com/5cc04f70e424020d8afe49bdc4c1c76683f0ea7b
> Cr-Commit-Position: refs/heads/master@{#370068}
TBR=sky@chromium.org,thestig@chromium.org,shuchen@chromium.org,ananta@chromium.org,dpranke@chromium.org,scottmg@chromium.org
NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true
BUG=558054
Review URL: https://codereview.chromium.org/1602403002
Cr-Commit-Position: refs/heads/master@{#370290}
Diffstat (limited to 'chrome/chrome_browser_ui.gypi')
-rw-r--r-- | chrome/chrome_browser_ui.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 70ff6b3..3abdf0a 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -558,6 +558,8 @@ 'browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h', 'browser/ui/ash/launcher/chrome_launcher_controller.cc', 'browser/ui/ash/launcher/chrome_launcher_controller.h', + 'browser/ui/ash/launcher/chrome_launcher_controller_chromeos.cc', + 'browser/ui/ash/launcher/chrome_launcher_controller_win.cc', 'browser/ui/ash/launcher/launcher_app_tab_helper.cc', 'browser/ui/ash/launcher/launcher_app_tab_helper.h', 'browser/ui/ash/launcher/launcher_application_menu_item_model.cc', |