summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/background_mode_manager.cc4
-rw-r--r--chrome/browser/dom_ui/options/advanced_options_utils_gtk.cc16
-rw-r--r--chrome/browser/gtk/gconf_titlebar_listener.cc6
-rw-r--r--chrome/browser/gtk/gtk_theme_provider.cc8
-rw-r--r--chrome/browser/gtk/options/advanced_contents_gtk.cc16
-rw-r--r--chrome/browser/profile_impl.cc20
-rw-r--r--chrome/common/chrome_paths_linux.cc12
7 files changed, 41 insertions, 41 deletions
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc
index d7999da..ef16b49 100644
--- a/chrome/browser/background_mode_manager.cc
+++ b/chrome/browser/background_mode_manager.cc
@@ -34,7 +34,7 @@
#include "base/file_util.h"
#include "base/task.h"
#include "base/utf_string_conversions.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
#include "chrome/common/chrome_version_info.h"
#endif
@@ -66,7 +66,7 @@ namespace {
FilePath GetAutostartDirectory(base::Environment* environment) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
FilePath result =
- base::GetXDGDirectory(environment, kXdgConfigHome, kConfig);
+ base::nix::GetXDGDirectory(environment, kXdgConfigHome, kConfig);
result = result.Append(kAutostart);
return result;
}
diff --git a/chrome/browser/dom_ui/options/advanced_options_utils_gtk.cc b/chrome/browser/dom_ui/options/advanced_options_utils_gtk.cc
index 22d1639..094701e 100644
--- a/chrome/browser/dom_ui/options/advanced_options_utils_gtk.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_utils_gtk.cc
@@ -12,7 +12,7 @@
#include "base/environment.h"
#include "base/process_util.h"
#include "base/string_tokenizer.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/process_watcher.h"
@@ -80,8 +80,8 @@ void AdvancedOptionsUtilities::ShowNetworkProxySettings(
ProxyConfigCommand command;
bool found_command = false;
- switch (base::GetDesktopEnvironment(env.get())) {
- case base::DESKTOP_ENVIRONMENT_GNOME: {
+ switch (base::nix::GetDesktopEnvironment(env.get())) {
+ case base::nix::DESKTOP_ENVIRONMENT_GNOME: {
size_t index;
ProxyConfigCommand commands[2];
commands[0].argv = kGNOMEProxyConfigCommand;
@@ -92,25 +92,25 @@ void AdvancedOptionsUtilities::ShowNetworkProxySettings(
break;
}
- case base::DESKTOP_ENVIRONMENT_KDE3:
+ case base::nix::DESKTOP_ENVIRONMENT_KDE3:
command.argv = kKDE3ProxyConfigCommand;
found_command = SearchPATH(&command, 1, NULL);
break;
- case base::DESKTOP_ENVIRONMENT_KDE4:
+ case base::nix::DESKTOP_ENVIRONMENT_KDE4:
command.argv = kKDE4ProxyConfigCommand;
found_command = SearchPATH(&command, 1, NULL);
break;
- case base::DESKTOP_ENVIRONMENT_XFCE:
- case base::DESKTOP_ENVIRONMENT_OTHER:
+ case base::nix::DESKTOP_ENVIRONMENT_XFCE:
+ case base::nix::DESKTOP_ENVIRONMENT_OTHER:
break;
}
if (found_command) {
StartProxyConfigUtil(command);
} else {
- const char* name = base::GetDesktopEnvironmentName(env.get());
+ const char* name = base::nix::GetDesktopEnvironmentName(env.get());
if (name)
LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
tab_contents->OpenURL(GURL(kLinuxProxyConfigUrl), GURL(),
diff --git a/chrome/browser/gtk/gconf_titlebar_listener.cc b/chrome/browser/gtk/gconf_titlebar_listener.cc
index b33ab17..671c197b 100644
--- a/chrome/browser/gtk/gconf_titlebar_listener.cc
+++ b/chrome/browser/gtk/gconf_titlebar_listener.cc
@@ -8,7 +8,7 @@
#include "base/scoped_ptr.h"
#include "base/environment.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
#include "chrome/browser/gtk/browser_titlebar.h"
namespace {
@@ -46,8 +46,8 @@ void GConfTitlebarListener::RemoveObserver(BrowserTitlebar* titlebar) {
GConfTitlebarListener::GConfTitlebarListener() : client_(NULL) {
scoped_ptr<base::Environment> env(base::Environment::Create());
- if (base::GetDesktopEnvironment(env.get()) ==
- base::DESKTOP_ENVIRONMENT_GNOME) {
+ if (base::nix::GetDesktopEnvironment(env.get()) ==
+ base::nix::DESKTOP_ENVIRONMENT_GNOME) {
client_ = gconf_client_get_default();
// If we fail to get a context, that's OK, since we'll just fallback on
// not receiving gconf keys.
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 5bcd8a3..4a6b0c9 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -12,7 +12,7 @@
#include "app/resource_bundle.h"
#include "base/environment.h"
#include "base/stl_util-inl.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
#include "chrome/browser/gtk/cairo_cached_surface.h"
#include "chrome/browser/gtk/gtk_chrome_button.h"
#include "chrome/browser/gtk/hover_controller_gtk.h"
@@ -552,9 +552,9 @@ GdkPixbuf* GtkThemeProvider::GetDefaultFavicon(bool native) {
bool GtkThemeProvider::DefaultUsesSystemTheme() {
scoped_ptr<base::Environment> env(base::Environment::Create());
- switch (base::GetDesktopEnvironment(env.get())) {
- case base::DESKTOP_ENVIRONMENT_GNOME:
- case base::DESKTOP_ENVIRONMENT_XFCE:
+ switch (base::nix::GetDesktopEnvironment(env.get())) {
+ case base::nix::DESKTOP_ENVIRONMENT_GNOME:
+ case base::nix::DESKTOP_ENVIRONMENT_XFCE:
return true;
default:
return false;
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index 343f9bd..fa1c1c9 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -20,7 +20,7 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_tokenizer.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/download_manager.h"
@@ -429,8 +429,8 @@ void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button,
ProxyConfigCommand command;
bool found_command = false;
- switch (base::GetDesktopEnvironment(env.get())) {
- case base::DESKTOP_ENVIRONMENT_GNOME: {
+ switch (base::nix::GetDesktopEnvironment(env.get())) {
+ case base::nix::DESKTOP_ENVIRONMENT_GNOME: {
size_t index;
ProxyConfigCommand commands[2];
commands[0].argv = kGNOMEProxyConfigCommand;
@@ -441,25 +441,25 @@ void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button,
break;
}
- case base::DESKTOP_ENVIRONMENT_KDE3:
+ case base::nix::DESKTOP_ENVIRONMENT_KDE3:
command.argv = kKDE3ProxyConfigCommand;
found_command = SearchPATH(&command, 1, NULL);
break;
- case base::DESKTOP_ENVIRONMENT_KDE4:
+ case base::nix::DESKTOP_ENVIRONMENT_KDE4:
command.argv = kKDE4ProxyConfigCommand;
found_command = SearchPATH(&command, 1, NULL);
break;
- case base::DESKTOP_ENVIRONMENT_XFCE:
- case base::DESKTOP_ENVIRONMENT_OTHER:
+ case base::nix::DESKTOP_ENVIRONMENT_XFCE:
+ case base::nix::DESKTOP_ENVIRONMENT_OTHER:
break;
}
if (found_command) {
StartProxyConfigUtil(section->profile(), command);
} else {
- const char* name = base::GetDesktopEnvironmentName(env.get());
+ const char* name = base::nix::GetDesktopEnvironmentName(env.get());
if (name)
LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
browser::ShowOptionsURL(section->profile(), GURL(kLinuxProxyConfigUrl));
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc
index 18ac330..4ed055b 100644
--- a/chrome/browser/profile_impl.cc
+++ b/chrome/browser/profile_impl.cc
@@ -98,7 +98,7 @@
#elif defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
#elif defined(OS_POSIX) && !defined(OS_CHROMEOS)
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
#if defined(USE_GNOME_KEYRING)
#include "chrome/browser/password_manager/native_backend_gnome_x.h"
#endif
@@ -929,28 +929,28 @@ void ProfileImpl::CreatePasswordStore() {
// On POSIX systems, we try to use the "native" password management system of
// the desktop environment currently running, allowing GNOME Keyring in XFCE.
// (In all cases we fall back on the default store in case of failure.)
- base::DesktopEnvironment desktop_env;
+ base::nix::DesktopEnvironment desktop_env;
std::string store_type =
CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kPasswordStore);
if (store_type == "kwallet") {
- desktop_env = base::DESKTOP_ENVIRONMENT_KDE4;
+ desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE4;
} else if (store_type == "gnome") {
- desktop_env = base::DESKTOP_ENVIRONMENT_GNOME;
+ desktop_env = base::nix::DESKTOP_ENVIRONMENT_GNOME;
} else if (store_type == "detect") {
scoped_ptr<base::Environment> env(base::Environment::Create());
- desktop_env = base::GetDesktopEnvironment(env.get());
+ desktop_env = base::nix::GetDesktopEnvironment(env.get());
LOG(INFO) << "Password storage detected desktop environment: " <<
- base::GetDesktopEnvironmentName(desktop_env);
+ base::nix::GetDesktopEnvironmentName(desktop_env);
} else {
// TODO(mdm): If the flag is not given, or has an unknown value, use the
// default store for now. Once we're confident in the other stores, we can
// default to detecting the desktop environment instead.
- desktop_env = base::DESKTOP_ENVIRONMENT_OTHER;
+ desktop_env = base::nix::DESKTOP_ENVIRONMENT_OTHER;
}
scoped_ptr<PasswordStoreX::NativeBackend> backend;
- if (desktop_env == base::DESKTOP_ENVIRONMENT_KDE4) {
+ if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4) {
// KDE3 didn't use DBus, which our KWallet store uses.
LOG(INFO) << "Trying KWallet for password storage.";
backend.reset(new NativeBackendKWallet());
@@ -958,8 +958,8 @@ void ProfileImpl::CreatePasswordStore() {
LOG(INFO) << "Using KWallet for password storage.";
else
backend.reset();
- } else if (desktop_env == base::DESKTOP_ENVIRONMENT_GNOME ||
- desktop_env == base::DESKTOP_ENVIRONMENT_XFCE) {
+ } else if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
+ desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) {
#if defined(USE_GNOME_KEYRING)
LOG(INFO) << "Trying GNOME keyring for password storage.";
backend.reset(new NativeBackendGnome());
diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc
index f0ff3fb..42c6ae7 100644
--- a/chrome/common/chrome_paths_linux.cc
+++ b/chrome/common/chrome_paths_linux.cc
@@ -7,7 +7,7 @@
#include "base/environment.h"
#include "base/file_util.h"
#include "base/scoped_ptr.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
namespace chrome {
@@ -19,7 +19,7 @@ namespace chrome {
bool GetDefaultUserDataDirectory(FilePath* result) {
scoped_ptr<base::Environment> env(base::Environment::Create());
FilePath config_dir(
- base::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
+ base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
#if defined(GOOGLE_CHROME_BUILD)
*result = config_dir.Append("google-chrome");
#else
@@ -31,7 +31,7 @@ bool GetDefaultUserDataDirectory(FilePath* result) {
bool GetChromeFrameUserDataDirectory(FilePath* result) {
scoped_ptr<base::Environment> env(base::Environment::Create());
FilePath config_dir(
- base::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
+ base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
#if defined(GOOGLE_CHROME_BUILD)
*result = config_dir.Append("google-chrome-frame");
#else
@@ -42,7 +42,7 @@ bool GetChromeFrameUserDataDirectory(FilePath* result) {
bool GetUserDocumentsDirectory(FilePath* result) {
scoped_ptr<base::Environment> env(base::Environment::Create());
- *result = base::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
+ *result = base::nix::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
return true;
}
@@ -50,7 +50,7 @@ bool GetUserDocumentsDirectory(FilePath* result) {
// ~ or their desktop directory, in which case we default to ~/Downloads.
bool GetUserDownloadsDirectory(FilePath* result) {
scoped_ptr<base::Environment> env(base::Environment::Create());
- *result = base::GetXDGUserDirectory(env.get(), "DOWNLOAD", "Downloads");
+ *result = base::nix::GetXDGUserDirectory(env.get(), "DOWNLOAD", "Downloads");
FilePath home = file_util::GetHomeDir();
if (*result == home) {
@@ -69,7 +69,7 @@ bool GetUserDownloadsDirectory(FilePath* result) {
bool GetUserDesktop(FilePath* result) {
scoped_ptr<base::Environment> env(base::Environment::Create());
- *result = base::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
+ *result = base::nix::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
return true;
}
generated by cgit v1.1 at 2025-02-11 19:55:54 +0000