5 files changed, 6 insertions, 25 deletions
diff --git a/chrome/browser/views/chrome_views_delegate.cc b/chrome/browser/views/chrome_views_delegate.cc
index 1c04bc6..c793a54 100644
--- a/chrome/browser/views/chrome_views_delegate.cc
+++ b/chrome/browser/views/chrome_views_delegate.cc
@@ -19,8 +19,7 @@ Clipboard* ChromeViewsDelegate::GetClipboard() const {
 
 void ChromeViewsDelegate::SaveWindowPlacement(const std::wstring& window_name,
                                               const gfx::Rect& bounds,
-                                              bool maximized,
-                                              bool always_on_top) {
+                                              bool maximized) {
   if (!g_browser_process->local_state())
     return;
 
@@ -32,7 +31,6 @@ void ChromeViewsDelegate::SaveWindowPlacement(const std::wstring& window_name,
   window_preferences->SetInteger(L"right", bounds.right());
   window_preferences->SetInteger(L"bottom", bounds.bottom());
   window_preferences->SetBoolean(L"maximized", maximized);
-  window_preferences->SetBoolean(L"always_on_top", always_on_top);
 }
 
 bool ChromeViewsDelegate::GetSavedWindowBounds(const std::wstring& window_name,
@@ -65,18 +63,6 @@ bool ChromeViewsDelegate::GetSavedMaximizedState(
       maximized;
 }
 
-bool ChromeViewsDelegate::GetSavedAlwaysOnTopState(
-    const std::wstring& window_name,
-    bool* always_on_top) const {
-  if (!g_browser_process->local_state())
-    return false;
-
-  const DictionaryValue* dictionary =
-      g_browser_process->local_state()->GetDictionary(window_name.c_str());
-  return dictionary && dictionary->GetBoolean(L"always_on_top", always_on_top) &&
-      always_on_top;
-}
-
 #if defined(OS_WIN)
 HICON ChromeViewsDelegate::GetDefaultWindowIcon() const {
   return LoadIcon(GetModuleHandle(L"chrome.dll"),
diff --git a/chrome/browser/views/chrome_views_delegate.h b/chrome/browser/views/chrome_views_delegate.h
index 007e7b0..346fd73 100644
--- a/chrome/browser/views/chrome_views_delegate.h
+++ b/chrome/browser/views/chrome_views_delegate.h
@@ -17,14 +17,11 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
   virtual Clipboard* GetClipboard() const;
   virtual void SaveWindowPlacement(const std::wstring& window_name,
                                    const gfx::Rect& bounds,
-                                   bool maximized,
-                                   bool always_on_top);
+                                   bool maximized);
   virtual bool GetSavedWindowBounds(const std::wstring& window_name,
                                     gfx::Rect* bounds) const;
   virtual bool GetSavedMaximizedState(const std::wstring& window_name,
                                       bool* maximized) const;
-  virtual bool GetSavedAlwaysOnTopState(const std::wstring& window_name,
-                                        bool* always_on_top) const;
 #if defined(OS_WIN)
   virtual HICON GetDefaultWindowIcon() const;
 #endif
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index a438cdf..1af097f 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1008,13 +1008,12 @@ std::wstring BrowserView::GetWindowName() const {
 }
 
 void BrowserView::SaveWindowPlacement(const gfx::Rect& bounds,
-                                      bool maximized,
-                                      bool always_on_top) {
+                                      bool maximized) {
   // If IsFullscreen() is true, we've just changed into fullscreen mode, and
   // we're catching the going-into-fullscreen sizing and positioning calls,
   // which we want to ignore.
   if (!IsFullscreen() && browser_->ShouldSaveWindowPlacement()) {
-    WindowDelegate::SaveWindowPlacement(bounds, maximized, always_on_top);
+    WindowDelegate::SaveWindowPlacement(bounds, maximized);
     browser_->SaveWindowPlacement(bounds, maximized);
   }
 }
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index c3e0734..af5b011 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -235,8 +235,7 @@ class BrowserView : public BrowserWindow,
   virtual bool ExecuteWindowsCommand(int command_id);
   virtual std::wstring GetWindowName() const;
   virtual void SaveWindowPlacement(const gfx::Rect& bounds,
-                                   bool maximized,
-                                   bool always_on_top);
+                                   bool maximized);
   virtual bool GetSavedWindowBounds(gfx::Rect* bounds) const;
   virtual bool GetSavedMaximizedState(bool* maximized) const;
   virtual views::View* GetContentsView();
diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc
index 8c9e6ad..1e72a6e 100644
--- a/chrome/browser/views/page_info_window.cc
+++ b/chrome/browser/views/page_info_window.cc
@@ -562,7 +562,7 @@ void PageInfoWindow::Init(Profile* profile,
     if (GetSavedWindowBounds(&bounds) && GetSavedMaximizedState(&maximized)) {
       CRect bounds_crect(bounds.ToRECT());
       CalculateWindowBounds(&bounds_crect);
-      SaveWindowPlacement(gfx::Rect(bounds_crect), maximized, false);
+      SaveWindowPlacement(gfx::Rect(bounds_crect), maximized);
     }
   }