summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 18:08:16 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 18:08:16 +0000
commitca38d8e05b6cbd729487c6ed619117ae7510e4c6 (patch)
tree7eb25a06ec77a3d590bcbe85a690d3e84a9e6bd8 /chrome/browser/views
parenta8c72ad420e48ee14106cc61340a3ce6064a3c2d (diff)
downloadchromium_src-ca38d8e05b6cbd729487c6ed619117ae7510e4c6.zip
chromium_src-ca38d8e05b6cbd729487c6ed619117ae7510e4c6.tar.gz
chromium_src-ca38d8e05b6cbd729487c6ed619117ae7510e4c6.tar.bz2
Remove personalization.h/cc by putting things in final resting places
Review URL: http://codereview.chromium.org/173085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/sync/sync_setup_wizard.cc2
-rw-r--r--chrome/browser/views/sync/sync_setup_wizard_unittest.cc1
-rw-r--r--chrome/browser/views/toolbar_view.cc5
3 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/views/sync/sync_setup_wizard.cc b/chrome/browser/views/sync/sync_setup_wizard.cc
index 2e86bfd..0421e4e 100644
--- a/chrome/browser/views/sync/sync_setup_wizard.cc
+++ b/chrome/browser/views/sync/sync_setup_wizard.cc
@@ -21,7 +21,7 @@
class SyncResourcesSource : public ChromeURLDataManager::DataSource {
public:
SyncResourcesSource()
- : DataSource(chrome::kSyncResourcesPath, MessageLoop::current()) {
+ : DataSource(chrome::kSyncResourcesHost, MessageLoop::current()) {
}
virtual ~SyncResourcesSource() { }
diff --git a/chrome/browser/views/sync/sync_setup_wizard_unittest.cc b/chrome/browser/views/sync/sync_setup_wizard_unittest.cc
index 88dae75..c327ca0 100644
--- a/chrome/browser/views/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/views/sync/sync_setup_wizard_unittest.cc
@@ -10,7 +10,6 @@
#include "base/stl_util-inl.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
-#include "chrome/browser/sync/personalization.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/views/sync/sync_setup_flow.h"
#include "chrome/browser/views/sync/sync_setup_wizard.h"
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 6d0b8cf..f7c3518 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -40,7 +40,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
#ifdef CHROME_PERSONALIZATION
-#include "chrome/browser/sync/personalization.h"
+#include "chrome/browser/sync/personalization_strings.h"
#endif
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -1086,8 +1086,7 @@ void ToolbarView::CreateAppMenu() {
app_menu_contents_->AddSeparator();
#ifdef CHROME_PERSONALIZATION
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) {
- app_menu_contents_->AddItem(IDC_P13N_INFO,
- Personalization::GetMenuItemInfoText(browser()));
+ app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, kMenuLabelStartSync);
}
#endif
app_menu_contents_->AddItemWithStringId(IDC_CLEAR_BROWSING_DATA,