summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/importer/profile_import_process_client.cc2
-rw-r--r--chrome/browser/importer/profile_import_process_host.cc2
-rw-r--r--chrome/browser/importer/profile_import_process_messages.cc (renamed from chrome/browser/importer/importer_messages.cc)17
-rw-r--r--chrome/browser/importer/profile_import_process_messages.h (renamed from chrome/browser/importer/importer_messages.h)19
-rw-r--r--chrome/chrome_browser.gypi4
-rw-r--r--chrome/profile_import/profile_import_thread.cc2
-rw-r--r--chrome/tools/ipclist/all_messages.h4
7 files changed, 23 insertions, 27 deletions
diff --git a/chrome/browser/importer/profile_import_process_client.cc b/chrome/browser/importer/profile_import_process_client.cc
index 097d1771..21311f6 100644
--- a/chrome/browser/importer/profile_import_process_client.cc
+++ b/chrome/browser/importer/profile_import_process_client.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/importer/profile_import_process_client.h"
#include "chrome/browser/history/history_types.h"
-#include "chrome/browser/importer/importer_messages.h"
#include "chrome/browser/importer/profile_import_process_host.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
#include "chrome/browser/search_engines/template_url.h"
#include "googleurl/src/gurl.h"
#include "ipc/ipc_message_macros.h"
diff --git a/chrome/browser/importer/profile_import_process_host.cc b/chrome/browser/importer/profile_import_process_host.cc
index c15dcd8..010490a 100644
--- a/chrome/browser/importer/profile_import_process_host.cc
+++ b/chrome/browser/importer/profile_import_process_host.cc
@@ -9,8 +9,8 @@
#include "base/string_number_conversions.h"
#include "base/values.h"
#include "chrome/browser/importer/firefox_importer_utils.h"
-#include "chrome/browser/importer/importer_messages.h"
#include "chrome/browser/importer/profile_import_process_client.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
#include "chrome/common/chrome_switches.h"
#include "grit/generated_resources.h"
#include "ipc/ipc_switches.h"
diff --git a/chrome/browser/importer/importer_messages.cc b/chrome/browser/importer/profile_import_process_messages.cc
index dc8a663..68603e4 100644
--- a/chrome/browser/importer/importer_messages.cc
+++ b/chrome/browser/importer/profile_import_process_messages.cc
@@ -1,36 +1,33 @@
-// 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.
// Get basic type definitions.
#define IPC_MESSAGE_IMPL
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
// Generate constructors.
#include "ipc/struct_constructor_macros.h"
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
// Generate destructors.
#include "ipc/struct_destructor_macros.h"
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
// Generate param traits write methods.
#include "ipc/param_traits_write_macros.h"
namespace IPC {
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
} // namespace IPC
// Generate param traits read methods.
#include "ipc/param_traits_read_macros.h"
namespace IPC {
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
} // namespace IPC
// Generate param traits log methods.
#include "ipc/param_traits_log_macros.h"
namespace IPC {
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
} // namespace IPC
-
-
-
diff --git a/chrome/browser/importer/importer_messages.h b/chrome/browser/importer/profile_import_process_messages.h
index 2e7a16e..96887f6 100644
--- a/chrome/browser/importer/importer_messages.h
+++ b/chrome/browser/importer/profile_import_process_messages.h
@@ -18,8 +18,8 @@
#include "ipc/ipc_message_utils.h"
#include "webkit/glue/password_form.h"
-#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
-#define CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
+#ifndef CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_
+#define CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_
namespace IPC {
@@ -365,7 +365,7 @@ struct ParamTraits<TemplateURL> {
} // namespace IPC
-#endif // CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
+#endif // CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_
#define IPC_MESSAGE_START ProfileImportMsgStart
@@ -374,9 +374,9 @@ struct ParamTraits<TemplateURL> {
// These are messages sent from the browser to the profile import process.
IPC_MESSAGE_CONTROL4(ProfileImportProcessMsg_StartImport,
importer::ProfileInfo /* ProfileInfo struct */,
- int /* bitmask of items to import */,
- DictionaryValue /* localized strings */,
- bool /* import to bookmark bar */)
+ int /* bitmask of items to import */,
+ DictionaryValue /* localized strings */,
+ bool /* import to bookmark bar */)
IPC_MESSAGE_CONTROL0(ProfileImportProcessMsg_CancelImport)
@@ -391,7 +391,7 @@ IPC_MESSAGE_CONTROL1(ProfileImportProcessMsg_ReportImportItemFinished,
IPC_MESSAGE_CONTROL0(ProfileImportProcessHostMsg_Import_Started)
IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_Import_Finished,
- bool /* was import successful? */,
+ bool /* was import successful? */,
std::string /* error message, if any */)
IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_ImportItem_Started,
@@ -425,13 +425,12 @@ IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFaviconsImportStart,
int /* total number of favicons */)
IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFaviconsImportGroup,
- std::vector<history::ImportedFaviconUsage> )
+ std::vector<history::ImportedFaviconUsage>)
IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyPasswordFormReady,
- webkit_glue::PasswordForm )
+ webkit_glue::PasswordForm)
IPC_MESSAGE_CONTROL3(ProfileImportProcessHostMsg_NotifyKeywordsReady,
std::vector<TemplateURL>,
int, /* default keyword index */
bool /* unique on host and path */)
-
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 48229d2..326d2fd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1193,8 +1193,6 @@
'browser/importer/importer_list.cc',
'browser/importer/importer_list.h',
'browser/importer/importer_lock_dialog.h',
- 'browser/importer/importer_messages.cc',
- 'browser/importer/importer_messages.h',
'browser/importer/importer_observer.h',
'browser/importer/importer_progress_dialog.h',
'browser/importer/importer_progress_observer.h',
@@ -1214,6 +1212,8 @@
'browser/importer/profile_import_process_client.h',
'browser/importer/profile_import_process_host.cc',
'browser/importer/profile_import_process_host.h',
+ 'browser/importer/profile_import_process_messages.cc',
+ 'browser/importer/profile_import_process_messages.h',
'browser/importer/profile_writer.cc',
'browser/importer/profile_writer.h',
'browser/importer/safari_importer.h',
diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc
index 872a4cd..30772fd 100644
--- a/chrome/profile_import/profile_import_thread.cc
+++ b/chrome/profile_import/profile_import_thread.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/importer/external_process_importer_bridge.h"
#include "chrome/browser/importer/importer.h"
#include "chrome/browser/importer/importer_list.h"
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
#include "chrome/browser/search_engines/template_url.h"
#include "content/common/child_process.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/tools/ipclist/all_messages.h b/chrome/tools/ipclist/all_messages.h
index d10c2f9..1d5f69b 100644
--- a/chrome/tools/ipclist/all_messages.h
+++ b/chrome/tools/ipclist/all_messages.h
@@ -1,4 +1,4 @@
-// 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.
@@ -6,7 +6,7 @@
// Inclusion of all message files present in the system. Keep this file
// up-to-date when adding a new value to enum IPCMessageStart in
// ipc/ipc_message_utils.h to include the corresponding message file.
-#include "chrome/browser/importer/importer_messages.h"
+#include "chrome/browser/importer/profile_import_process_messages.h"
#include "chrome/common/common_message_generator.h"
#include "chrome/common/automation_messages.h"
#include "chrome/common/nacl_messages.h"
generated by cgit v1.1 at 2025-03-12 04:13:11 +0000