summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 19:28:17 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 19:28:17 +0000
commit6e93e526a35e8001a0ec46cc60e9230863be289c (patch)
tree8285fcbdf1aa0834f0d512e1991877b74e94b40d /chrome/browser
parent9eb977d2e0c7f8e074906edcad2cb1e0915e0c62 (diff)
downloadchromium_src-6e93e526a35e8001a0ec46cc60e9230863be289c.zip
chromium_src-6e93e526a35e8001a0ec46cc60e9230863be289c.tar.gz
chromium_src-6e93e526a35e8001a0ec46cc60e9230863be289c.tar.bz2
Moving GoogleUpdateSettings to util. Installer as well as Chrome needs these settings.
BUG=1296800 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_main.cc2
-rw-r--r--chrome/browser/metrics_service.cc2
-rw-r--r--chrome/browser/rlz/rlz.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index c3531a2..24f07ce 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -40,7 +40,6 @@
#include "base/registry.h"
#include "base/string_util.h"
#include "base/tracked_objects.h"
-#include "chrome/app/google_update_settings.h"
#include "chrome/app/result_codes.h"
#include "chrome/browser/automation/automation_provider.h"
#include "chrome/browser/browser.h"
@@ -73,6 +72,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
#include "chrome/common/win_util.h"
+#include "chrome/installer/util/google_update_settings.h"
#include "chrome/views/accelerator_handler.h"
#include "net/base/net_module.h"
#include "net/base/net_resources.h"
diff --git a/chrome/browser/metrics_service.cc b/chrome/browser/metrics_service.cc
index 524b4eb..038ebf9 100644
--- a/chrome/browser/metrics_service.cc
+++ b/chrome/browser/metrics_service.cc
@@ -187,7 +187,6 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/task.h"
-#include "chrome/app/google_update_settings.h"
#include "chrome/browser/bookmark_bar_model.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
@@ -204,6 +203,7 @@
#include "chrome/common/libxml_utils.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
+#include "chrome/installer/util/google_update_settings.h"
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
#include "third_party/bzip2/bzlib.h"
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 00cee6d..9bf2600 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -41,13 +41,13 @@
#include "base/path_service.h"
#include "base/task.h"
#include "base/thread.h"
-#include "chrome/app/google_update_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/profile_manager.h"
#include "chrome/browser/template_url_model.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/env_vars.h"
+#include "chrome/installer/util/google_update_settings.h"
//#include "chrome/common/pref_names.h"
//#include "chrome/common/pref_service.h"