Carnitas: Remove chrome/browser/views, update references.

chrome/browser/importer/importer.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/importer.h"
 
 #include "app/l10n_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/notification_source.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/favicon_size.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
 #include "app/win/win_util.h"
-#include "chrome/browser/views/importer_lock_view.h"
+#include "chrome/browser/ui/views/importer_lock_view.h"
 #include "views/window/window.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/importer_lock_dialog.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/gtk/import_lock_dialog_gtk.h"
 #endif
 
 using webkit_glue::PasswordForm;
 
 // Importer.
@@ skipping 566 matching lines @@
   template_url_vec.reserve(template_urls.size());
   std::vector<TemplateURL>::const_iterator iter;
   for (iter = template_urls.begin();
        iter != template_urls.end();
        ++iter) {
     template_url_vec.push_back(new TemplateURL(*iter));
   }
   bridge_->SetKeywords(template_url_vec, default_keyword_index,
                        unique_on_host_and_path);
 }