diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-12 19:03:52 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-12 19:03:52 +0000 |
| commit | 49e709fcf0bb293e6b9f3302bc5f4fda8b6e3314 (patch) | |
| tree | 143dd1f734167f047615bc8e95868a40abcec75e /chrome/chrome_resources.gyp | |
| parent | 670621d77f9bd10669ca4731f13d8acc016752c9 (diff) | |
| download | chromium_src-49e709fcf0bb293e6b9f3302bc5f4fda8b6e3314.zip chromium_src-49e709fcf0bb293e6b9f3302bc5f4fda8b6e3314.tar.gz chromium_src-49e709fcf0bb293e6b9f3302bc5f4fda8b6e3314.tar.bz2 | |
Revert 282837 because it broke non-chromeos builds.
> chromeos: Move some network related UI in ui/chromeos/
>
> Move the code responsible for showing network icons into a common component
> so that it can be used from both ash and athena. This also moves the relevant
> string and image-resources out of ash into separate ui_chromeos_ targets.
>
> R=mmoss@chromium.org, oshima@chromium.org, sky@chromium.org, stevenjb@chromium.org
> TBR=derat@ for third_party/cros_system_api owners
> BUG=387199
>
> Review URL: https://codereview.chromium.org/351353004
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/383373002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_resources.gyp')
| -rw-r--r-- | chrome/chrome_resources.gyp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index a405ef9..a166312 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -453,12 +453,6 @@ '<(DEPTH)/ash/ash_strings.gyp:ash_strings', ], }], - ['chromeos==1', { - 'dependencies': [ - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', - ], - }], ['enable_autofill_dialog==1 and OS!="android"', { 'dependencies': [ '<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings', |