diff options
| author | varkha <varkha@chromium.org> | 2016-01-20 09:28:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-20 17:29:27 +0000 |
| commit | 02ab7b0f71c54b377fdae7ccac6370b9801d534e (patch) | |
| tree | df6121ec1f7cb064fba77222e44be7cc1e791691 /components/infobars | |
| parent | 86d4299aab64be02eb5bad330c00f6e1d881fe1e (diff) | |
| download | chromium_src-02ab7b0f71c54b377fdae7ccac6370b9801d534e.zip chromium_src-02ab7b0f71c54b377fdae7ccac6370b9801d534e.tar.gz chromium_src-02ab7b0f71c54b377fdae7ccac6370b9801d534e.tar.bz2 | |
Moves ui/base/resource/material_design/* to ui/base/material_design/*
ui/base/resource/material_design/ files were placed in subfolder of
ui/base/resource/ because original plan was limited to working with
different assets. This is no longer the case and having those files
under resource/ seems artificial and restrictive.
BUG=none
TEST=Chrome builds successfully.
Review URL: https://codereview.chromium.org/1607893003
Cr-Commit-Position: refs/heads/master@{#370422}
Diffstat (limited to 'components/infobars')
| -rw-r--r-- | components/infobars/core/infobar.cc | 2 | ||||
| -rw-r--r-- | components/infobars/core/infobar_delegate.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/infobars/core/infobar.cc b/components/infobars/core/infobar.cc index ed2c5f0..840cfe7 100644 --- a/components/infobars/core/infobar.cc +++ b/components/infobars/core/infobar.cc @@ -11,7 +11,7 @@ #include "build/build_config.h" #include "components/infobars/core/infobar_container.h" #include "components/infobars/core/infobar_manager.h" -#include "ui/base/resource/material_design/material_design_controller.h" +#include "ui/base/material_design/material_design_controller.h" #include "ui/gfx/animation/slide_animation.h" namespace infobars { diff --git a/components/infobars/core/infobar_delegate.cc b/components/infobars/core/infobar_delegate.cc index 4da01aa..c5c67c1 100644 --- a/components/infobars/core/infobar_delegate.cc +++ b/components/infobars/core/infobar_delegate.cc @@ -8,7 +8,7 @@ #include "build/build_config.h" #include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar_manager.h" -#include "ui/base/resource/material_design/material_design_controller.h" +#include "ui/base/material_design/material_design_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/vector_icons_public.h" |