diff options
| author | estade <estade@chromium.org> | 2015-10-02 16:18:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-02 23:19:13 +0000 |
| commit | 74325ebe81958c6c3638e8478d9898db5a2d4be9 (patch) | |
| tree | cb7f74e470f9342903c6ebb4fb25a097df271c10 /chrome/chrome_browser_ui.gypi | |
| parent | 2742356a0432208096460aae48bd3a807b19351e (diff) | |
| download | chromium_src-74325ebe81958c6c3638e8478d9898db5a2d4be9.zip chromium_src-74325ebe81958c6c3638e8478d9898db5a2d4be9.tar.gz chromium_src-74325ebe81958c6c3638e8478d9898db5a2d4be9.tar.bz2 | |
Don't compile unused passwords ui code on Android.
Also fix some multiple inheritance (banned in Chrome style guide) by
deleting ManagePasswordsBubble.
BUG=505953
Review URL: https://codereview.chromium.org/1374383002
Cr-Commit-Position: refs/heads/master@{#352169}
Diffstat (limited to 'chrome/chrome_browser_ui.gypi')
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index ccda4bc..2a77c15 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -172,12 +172,6 @@ 'browser/ui/passwords/account_avatar_fetcher.h', 'browser/ui/passwords/account_chooser_more_combobox_model.cc', 'browser/ui/passwords/account_chooser_more_combobox_model.h', - 'browser/ui/passwords/manage_passwords_bubble.cc', - 'browser/ui/passwords/manage_passwords_bubble.h', - 'browser/ui/passwords/manage_passwords_bubble_model.cc', - 'browser/ui/passwords/manage_passwords_bubble_model.h', - 'browser/ui/passwords/manage_passwords_icon.cc', - 'browser/ui/passwords/manage_passwords_icon.h', 'browser/ui/passwords/manage_passwords_state.cc', 'browser/ui/passwords/manage_passwords_state.h', 'browser/ui/passwords/manage_passwords_ui_controller.cc', @@ -1617,6 +1611,10 @@ 'browser/ui/panels/stacked_panel_collection.h', 'browser/ui/panels/stacked_panel_drag_handler.cc', 'browser/ui/panels/stacked_panel_drag_handler.h', + 'browser/ui/passwords/manage_passwords_bubble_model.cc', + 'browser/ui/passwords/manage_passwords_bubble_model.h', + 'browser/ui/passwords/manage_passwords_icon.cc', + 'browser/ui/passwords/manage_passwords_icon.h', 'browser/ui/passwords/manage_passwords_view_utils_desktop.cc', 'browser/ui/passwords/manage_passwords_view_utils_desktop.h', 'browser/ui/pdf/adobe_reader_info_win.cc', |