diff options
| author | nasko <nasko@chromium.org> | 2014-09-12 11:21:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 18:30:31 +0000 |
| commit | 1d9925fdc873e99328ba6524d1600da678a9e306 (patch) | |
| tree | a7aef61eefa971e3f10c61ada545a3877a627615 /chrome/chrome_browser_chromeos.gypi | |
| parent | 445ee792be6efa64d9da2c67b05a7ec0c01c65dd (diff) | |
| download | chromium_src-1d9925fdc873e99328ba6524d1600da678a9e306.zip chromium_src-1d9925fdc873e99328ba6524d1600da678a9e306.tar.gz chromium_src-1d9925fdc873e99328ba6524d1600da678a9e306.tar.bz2 | |
Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*. (patchset #4 id:60001 of https://codereview.chromium.org/548323003/)
Reason for revert:
Breaks compile on multiple bots:
http://build.chromium.org/p/chromium.win/builders/Win%20Builder%20%28dbg%29/builds/3134
http://build.chromium.org/p/chromium.mac/builders/Mac%20Builder%20%28dbg%29/builds/73424
http://build.chromium.org/p/chromium.webkit/builders/GPU%20Win%20Builder%20%28dbg%29/builds/13365
Original issue's description:
> Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.
>
> BUG=398856
> TEST=existing browser_tests and unit_tests
> R=erg@chromium.org, jochen@chromium.org, nkostylev@chromium.org, pastarmovj@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/46a58bffbe303d3484d7cc288b47bfae5388109c
TBR=jochen@chromium.org,erg@chromium.org,nkostylev@chromium.org,pastarmovj@chromium.org,ygorshenin@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=398856
Review URL: https://codereview.chromium.org/565293003
Cr-Commit-Position: refs/heads/master@{#294618}
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 9f55b2b..e5c29c0 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -782,10 +782,10 @@ 'browser/chromeos/options/wifi_config_view.h', 'browser/chromeos/options/wimax_config_view.cc', 'browser/chromeos/options/wimax_config_view.h', - 'browser/chromeos/ownership/owner_settings_service_chromeos.cc', - 'browser/chromeos/ownership/owner_settings_service_chromeos.h', - 'browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc', - 'browser/chromeos/ownership/owner_settings_service_chromeos_factory.h', + 'browser/chromeos/ownership/owner_settings_service.cc', + 'browser/chromeos/ownership/owner_settings_service.h', + 'browser/chromeos/ownership/owner_settings_service_factory.cc', + 'browser/chromeos/ownership/owner_settings_service_factory.h', 'browser/chromeos/platform_keys/platform_keys.cc', 'browser/chromeos/platform_keys/platform_keys.h', 'browser/chromeos/platform_keys/platform_keys_nss.cc', |