diff options
Diffstat (limited to 'chrome/browser/autofill/autofill_dialog.h')
| -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; |