summaryrefslogtreecommitdiffstats
path: root/chrome/profile_import
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
commitf3a1c64a4d81c412273ed567536f23c2c14813a2 (patch)
treef0ced21805b18546e879413e4f808dd4f683c534 /chrome/profile_import
parent2338319a9acbaecba44243740b3f01b5c408a78a (diff)
downloadchromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.zip
chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.gz
chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.bz2
Move base/values.h into the base namespace. This includes a cros DEPS roll
with a minor change to that code since libcros also uses base/values.h. BUG=88666 TEST=none Review URL: http://codereview.chromium.org/7259019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/profile_import')
-rw-r--r--chrome/profile_import/profile_import_thread.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h
index 3347d40..b689ed4 100644
--- a/chrome/profile_import/profile_import_thread.h
+++ b/chrome/profile_import/profile_import_thread.h
@@ -18,13 +18,13 @@
#include "content/common/child_thread.h"
#include "webkit/glue/password_form.h"
-class DictionaryValue;
class ExternalProcessImporterBridge;
class GURL;
class Importer;
class TemplateURL;
namespace base {
+class DictionaryValue;
class Thread;
}
@@ -75,7 +75,7 @@ class ProfileImportThread : public ChildThread {
void OnImportStart(
const importer::SourceProfile& source_profile,
uint16 items,
- const DictionaryValue& localized_strings);
+ const base::DictionaryValue& localized_strings);
// Calls cleanup to stop the import operation.
void OnImportCancel();