diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/importer | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/importer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 32f48d3..a9deb82 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -9,7 +9,6 @@ #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_navigator.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/browsing_instance.h" @@ -19,6 +18,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/notification_service.h" #include "gfx/codec/png_codec.h" |