summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.cc1
-rw-r--r--chrome/browser/importer/importer.h6
-rw-r--r--chrome/browser/plugin_process_host.cc11
-rw-r--r--chrome/browser/plugin_process_host.h2
-rw-r--r--chrome/browser/profile.cc1
-rw-r--r--chrome/browser/profile.h2
-rw-r--r--chrome/browser/views/frame/browser_frame_win.cc1
-rw-r--r--chrome/browser/views/location_bar_view.cc1
-rw-r--r--chrome/common/child_process_info.cc4
-rw-r--r--chrome/common/child_process_info.h1
11 files changed, 23 insertions, 10 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 7da448b..8ff7699 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2236,6 +2236,9 @@ each locale. aa1 -->
<message name="IDS_TASK_MANAGER_UTILITY_PREFIX" desc="The prefix for a utility process row">
Utility:
</message>
+ <message name="IDS_TASK_MANAGER_PROFILE_IMPORT_PREFIX" desc="The prefix for a profile import process row">
+ Profile Import:
+ </message>
<!-- Extension Crashed Info Bar-->
<message name="IDS_EXTENSION_CRASHED_INFOBAR_RESTART_BUTTON" desc="Title of the reload button in the extension crashed infobar. After the button is clicked, the extension will be reloaded.">
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index f59259f..18d935c 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -11,6 +11,7 @@
#include "app/animation.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "app/theme_provider.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/histogram.h"
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index df8bc48..1b8499e 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -159,7 +159,7 @@ class ProfileWriter : public base::RefCounted<ProfileWriter> {
Profile* profile_;
- DISALLOW_EVIL_CONSTRUCTORS(ProfileWriter);
+ DISALLOW_COPY_AND_ASSIGN(ProfileWriter);
};
// This class hosts the importers. It enumerates profiles from other
@@ -331,7 +331,7 @@ class ImporterHost : public base::RefCounted<ImporterHost>,
// Firefox profile lock.
scoped_ptr<FirefoxProfileLock> firefox_lock_;
- DISALLOW_EVIL_CONSTRUCTORS(ImporterHost);
+ DISALLOW_COPY_AND_ASSIGN(ImporterHost);
};
// The base class of all importers.
@@ -402,7 +402,7 @@ class Importer : public base::RefCounted<Importer> {
// True if the importer is created in the first run UI.
bool import_to_bookmark_bar_;
- DISALLOW_EVIL_CONSTRUCTORS(Importer);
+ DISALLOW_COPY_AND_ASSIGN(Importer);
};
// An interface an object that calls StartImportingWithUI can call to be
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 253c100..4c1d949 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -336,7 +336,7 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
if (!CreateChannel())
return false;
- // build command line for plugin, we have to quote the plugin's path to deal
+ // Build command line for plugin, we have to quote the plugin's path to deal
// with spaces.
std::wstring exe_path = GetChildPath();
if (exe_path.empty()) {
@@ -354,7 +354,7 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
if (logging::DialogsAreSuppressed())
cmd_line.AppendSwitch(switches::kNoErrorDialogs);
- // propagate the following switches to the plugin command line (along with
+ // Propagate the following switches to the plugin command line (along with
// any associated values) if present in the browser command line
static const wchar_t* const switch_names[] = {
switches::kPluginStartupDialog,
@@ -434,9 +434,10 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
env.push_back(std::pair<const char*, const char*>(
plugin_interpose_strings::kDYLDInsertLibrariesKey,
interpose_list.c_str()));
-#endif
- base::LaunchApp(cmd_line.argv(), env, fds_to_map, false, &process);
-#endif
+#endif // OS_MACOSX
+ if (!base::LaunchApp(cmd_line.argv(), env, fds_to_map, false, &process))
+ return false;
+#endif // OS_WIN
if (!process)
return false;
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h
index a223503..36f8d1e 100644
--- a/chrome/browser/plugin_process_host.h
+++ b/chrome/browser/plugin_process_host.h
@@ -144,7 +144,7 @@ class PluginProcessHost : public ChildProcessHost,
std::set<HWND> plugin_parent_windows_set_;
#endif
- DISALLOW_EVIL_CONSTRUCTORS(PluginProcessHost);
+ DISALLOW_COPY_AND_ASSIGN(PluginProcessHost);
};
#endif // CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 208bd0c..8d33985 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/profile.h"
+#include "app/theme_provider.h"
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/file_util.h"
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h
index a4f887c..675c6aa 100644
--- a/chrome/browser/profile.h
+++ b/chrome/browser/profile.h
@@ -10,7 +10,6 @@
#include <set>
#include <string>
-#include "app/theme_provider.h"
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/scoped_ptr.h"
@@ -52,6 +51,7 @@ class SQLitePersistentCookieStore;
class TabRestoreService;
class TemplateURLFetcher;
class TemplateURLModel;
+class ThemeProvider;
class ThumbnailStore;
class URLRequestContext;
class UserScriptMaster;
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
index 9e31dba..80cd7b2 100644
--- a/chrome/browser/views/frame/browser_frame_win.cc
+++ b/chrome/browser/views/frame/browser_frame_win.cc
@@ -8,6 +8,7 @@
#include <shellapi.h>
#include "app/resource_bundle.h"
+#include "app/theme_provider.h"
#include "app/win_util.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index e5ba8f6..34f23f2 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -14,6 +14,7 @@
#include "app/gfx/color_utils.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "app/theme_provider.h"
#include "base/file_util.h"
#include "base/keyboard_codes.h"
#include "base/path_service.h"
diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc
index b06d002..71886f7 100644
--- a/chrome/common/child_process_info.cc
+++ b/chrome/common/child_process_info.cc
@@ -48,6 +48,8 @@ std::wstring ChildProcessInfo::GetTypeNameInEnglish(
return L"Web Worker";
case UTILITY_PROCESS:
return L"Utility";
+ case PROFILE_IMPORT_PROCESS:
+ return L"Profile Import helper";
case ZYGOTE_PROCESS:
return L"Zygote";
case SANDBOX_HELPER_PROCESS:
@@ -71,6 +73,8 @@ std::wstring ChildProcessInfo::GetLocalizedTitle() const {
message_id = IDS_TASK_MANAGER_WORKER_PREFIX;
} else if (type_ == ChildProcessInfo::UTILITY_PROCESS) {
message_id = IDS_TASK_MANAGER_UTILITY_PREFIX;
+ } else if (type_ == ChildProcessInfo::PROFILE_IMPORT_PROCESS) {
+ message_id = IDS_TASK_MANAGER_PROFILE_IMPORT_PREFIX;
} else {
DCHECK(false) << "Need localized name for child process type.";
return title;
diff --git a/chrome/common/child_process_info.h b/chrome/common/child_process_info.h
index fa03c0f..250ff57 100644
--- a/chrome/common/child_process_info.h
+++ b/chrome/common/child_process_info.h
@@ -18,6 +18,7 @@ class ChildProcessInfo {
PLUGIN_PROCESS,
WORKER_PROCESS,
UTILITY_PROCESS,
+ PROFILE_IMPORT_PROCESS,
ZYGOTE_PROCESS,
SANDBOX_HELPER_PROCESS,
UNKNOWN_PROCESS,
generated by cgit v1.1 at 2025-01-18 09:55:50 +0000