diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-02 13:35:19 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:42 -0700 |
| commit | ae05a4e8ea873f25be36252035e176a8e0a7348e (patch) | |
| tree | 691c21c3afd45df6d137ec5ce0991f3e6a422887 /chrome | |
| parent | 027acd4563fcee54533d14a8e27ca893a2f28b1b (diff) | |
| download | external_chromium-ae05a4e8ea873f25be36252035e176a8e0a7348e.zip external_chromium-ae05a4e8ea873f25be36252035e176a8e0a7348e.tar.gz external_chromium-ae05a4e8ea873f25be36252035e176a8e0a7348e.tar.bz2 | |
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_dialog.h
gfx/* moved to ui/gfx/* upstream:
http://codereview.chromium.org/6312156
Change-Id: Icbc82026a2496a0a7ddbd0069b558973ba7ec620
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autofill/autofill_dialog.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/autofill/autofill_dialog.h b/chrome/browser/autofill/autofill_dialog.h index a3ad48d..071964d 100644 --- a/chrome/browser/autofill/autofill_dialog.h +++ b/chrome/browser/autofill/autofill_dialog.h @@ -10,18 +10,14 @@ #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/credit_card.h" -<<<<<<< HEAD #ifdef ANDROID namespace gfx { typedef void* NativeView; } #else -#include "gfx/native_widget_types.h" -#endif -======= #include "ui/gfx/native_widget_types.h" ->>>>>>> chromium.org at r11.0.672.0 +#endif class Profile; |