diff options
| -rw-r--r-- | android/autofill/profile_android.h | 2 | ||||
| -rw-r--r-- | chrome/browser/autofill/autofill_manager.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h index c2e4913..399813f 100644 --- a/android/autofill/profile_android.h +++ b/android/autofill/profile_android.h @@ -37,7 +37,7 @@ #include "base/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" namespace base { class Time; diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index 1d813c8..f797a0e 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -20,12 +20,8 @@ #include "chrome/browser/autofill/phone_number.h" #include "chrome/browser/autofill/select_control_handler.h" #include "chrome/browser/prefs/pref_service.h" -<<<<<<< HEAD -#include "chrome/browser/profile.h" -#ifndef ANDROID -======= #include "chrome/browser/profiles/profile.h" ->>>>>>> chromium.org at r10.0.621.0 +#ifndef ANDROID #include "chrome/browser/renderer_host/render_view_host.h" #endif #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 658bd84..500418c 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -9,7 +9,7 @@ #ifdef ANDROID #include "android/autofill/profile_android.h" #include "base/scoped_ptr.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/autofill/autofill_host.h" // Autofill does not need the entire TabContents class, just |