Remove unused bits and pieces of #ifdefed code that isn't used.

Review URL: http://codereview.chromium.org/93042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14402 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 46 deletions

diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index e9378ff..cf638b7 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -280,12 +280,7 @@ BrowserView::BrowserView(Browser* browser)
       initialized_(false),
       ignore_layout_(false),
       hung_window_detector_(&hung_plugin_action_),
-      ticker_(0)
-#ifdef CHROME_PERSONALIZATION
-      , personalization_enabled_(false),
-      personalization_(NULL)
-#endif
-      {
+      ticker_(0) {
   InitClass();
   browser_->tabstrip_model()->AddObserver(this);
 }
@@ -1188,12 +1183,6 @@ void BrowserView::Layout() {
   if (find_controller)
     find_controller->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
   LayoutStatusBubble(bottom);
-#ifdef CHROME_PERSONALIZATION
-  if (IsPersonalizationEnabled()) {
-    Personalization::ConfigureFramePersonalization(personalization_,
-                                                   toolbar_, 0);
-  }
-#endif
   SchedulePaint();
 }
 
@@ -1243,15 +1232,6 @@ void BrowserView::Init() {
 
   status_bubble_.reset(new StatusBubbleViews(GetWidget()));
 
-#ifdef CHROME_PERSONALIZATION
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  EnablePersonalization(!command_line.HasSwitch(switches::kDisableP13n));
-  if (IsPersonalizationEnabled()) {
-    personalization_ = Personalization::CreateFramePersonalization(
-        browser_->profile(), this);
-  }
-#endif
-
   InitSystemMenu();
 }
 
@@ -1292,10 +1272,6 @@ int BrowserView::LayoutTabStrip() {
 
 int BrowserView::LayoutToolbar(int top) {
   int browser_view_width = width();
-#ifdef CHROME_PERSONALIZATION
-  if (IsPersonalizationEnabled())
-    Personalization::AdjustBrowserView(personalization_, &browser_view_width);
-#endif
   bool visible = IsToolbarVisible();
   toolbar_->GetLocationBarView()->SetFocusable(visible);
   int y = top -
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 30b5aaf6..fa9202e 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -9,9 +9,6 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 #include "chrome/browser/hang_monitor/hung_window_detector.h"
-#ifdef CHROME_PERSONALIZATION
-#include "chrome/personalization/personalization.h"
-#endif
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/views/window/client_view.h"
@@ -243,18 +240,6 @@ class BrowserView : public BrowserWindow,
   // Overridden from views::ClientView:
   virtual bool CanClose() const;
   virtual int NonClientHitTest(const gfx::Point& point);
-
-  // Is P13N enabled for this browser window?
-#ifdef CHROME_PERSONALIZATION
-  virtual bool IsPersonalizationEnabled() const {
-    return personalization_enabled_;
-  }
-
-  void EnablePersonalization(bool enable_personalization) {
-    personalization_enabled_ = enable_personalization;
-  }
-#endif
-
   virtual std::string GetClassName() const;
 
  protected:
@@ -411,12 +396,6 @@ class BrowserView : public BrowserWindow,
   // The timer used to update frames for the Loading Animation.
   base::RepeatingTimer<BrowserView> loading_animation_timer_;
 
-  // P13N stuff
-#ifdef CHROME_PERSONALIZATION
-  FramePersonalization personalization_;
-  bool personalization_enabled_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };