Remove more non-aura windows code.

chrome/browser/ui/views/task_manager_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/task_manager.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/stats_table.h"
 #include "base/prefs/pref_service.h"
@@ skipping 199 matching lines @@
  private:
   // Creates the child controls.
   void Init();
 
   // Initializes the state of the always-on-top setting as the window is shown.
   void InitAlwaysOnTopState();
 
   // Activates the tab associated with the focused row.
   void ActivateFocusedTab();
 
-  // Adds an always on top item to the window's system menu.
-  void AddAlwaysOnTopSystemMenuItem();
-
   // Restores saved always on top state from a previous session.
   bool GetSavedAlwaysOnTopState(bool* always_on_top) const;
 
   views::LabelButton* purge_memory_button_;
   views::LabelButton* kill_button_;
   views::Link* about_memory_link_;
   views::TableView* tab_table_;
   views::View* tab_table_parent_;
 
   TaskManager* task_manager_;
@@ skipping 316 matching lines @@
 // DialogDelegate implementation.
 bool TaskManagerView::CanResize() const {
   return true;
 }
 
 bool TaskManagerView::CanMaximize() const {
   return true;
 }
 
 bool TaskManagerView::ExecuteWindowsCommand(int command_id) {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  if (command_id == IDC_ALWAYS_ON_TOP) {
-    is_always_on_top_ = !is_always_on_top_;
-
-    // Change the menu check state.
-    HMENU system_menu = GetSystemMenu(GetWidget()->GetNativeWindow(), FALSE);
-    MENUITEMINFO menu_info;
-    memset(&menu_info, 0, sizeof(MENUITEMINFO));
-    menu_info.cbSize = sizeof(MENUITEMINFO);
-    BOOL r = GetMenuItemInfo(system_menu, IDC_ALWAYS_ON_TOP,
-                             FALSE, &menu_info);
-    DCHECK(r);
-    menu_info.fMask = MIIM_STATE;
-    if (is_always_on_top_)
-      menu_info.fState = MFS_CHECKED;
-    r = SetMenuItemInfo(system_menu, IDC_ALWAYS_ON_TOP, FALSE, &menu_info);
-
-    // Now change the actual window's behavior.
-    GetWidget()->SetAlwaysOnTop(is_always_on_top_);
-
-    // Save the state.
-    if (g_browser_process->local_state()) {
-      DictionaryPrefUpdate update(g_browser_process->local_state(),
-                                  GetWindowName().c_str());
-      base::DictionaryValue* window_preferences = update.Get();
-      window_preferences->SetBoolean("always_on_top", is_always_on_top_);
-    }
-    return true;
-  }
-#endif
   return false;
 }
 
 base::string16 TaskManagerView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_TITLE);
 }
 
 std::string TaskManagerView::GetWindowName() const {
   return prefs::kTaskManagerWindowPlacement;
 }
@@ skipping 76 matching lines @@
 }
 
 void TaskManagerView::ExecuteCommand(int id, int event_flags) {
   tab_table_->SetColumnVisibility(id, !tab_table_->IsColumnVisible(id));
 }
 
 void TaskManagerView::InitAlwaysOnTopState() {
   is_always_on_top_ = false;
   if (GetSavedAlwaysOnTopState(&is_always_on_top_))
     GetWidget()->SetAlwaysOnTop(is_always_on_top_);
-  AddAlwaysOnTopSystemMenuItem();
 }
 
 void TaskManagerView::ActivateFocusedTab() {
   const int active_row = tab_table_->selection_model().active();
   if (active_row != -1)
     task_manager_->ActivateProcess(active_row);
 }
 
-void TaskManagerView::AddAlwaysOnTopSystemMenuItem() {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  // The Win32 API requires that we own the text.
-  always_on_top_menu_text_ = l10n_util::GetStringUTF16(IDS_ALWAYS_ON_TOP);
-
-  // Let's insert a menu to the window.
-  HMENU system_menu = ::GetSystemMenu(GetWidget()->GetNativeWindow(), FALSE);
-  int index = ::GetMenuItemCount(system_menu) - 1;
-  if (index < 0) {
-    // Paranoia check.
-    NOTREACHED();
-    index = 0;
-  }
-  // First we add the separator.
-  MENUITEMINFO menu_info;
-  memset(&menu_info, 0, sizeof(MENUITEMINFO));
-  menu_info.cbSize = sizeof(MENUITEMINFO);
-  menu_info.fMask = MIIM_FTYPE;
-  menu_info.fType = MFT_SEPARATOR;
-  ::InsertMenuItem(system_menu, index, TRUE, &menu_info);
-
-  // Then the actual menu.
-  menu_info.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_STATE;
-  menu_info.fType = MFT_STRING;
-  menu_info.fState = MFS_ENABLED;
-  if (is_always_on_top_)
-    menu_info.fState |= MFS_CHECKED;
-  menu_info.wID = IDC_ALWAYS_ON_TOP;
-  menu_info.dwTypeData = const_cast<wchar_t*>(always_on_top_menu_text_.c_str());
-  ::InsertMenuItem(system_menu, index, TRUE, &menu_info);
-#endif
-}
-
 bool TaskManagerView::GetSavedAlwaysOnTopState(bool* always_on_top) const {
   if (!g_browser_process->local_state())
     return false;
 
   const base::DictionaryValue* dictionary =
       g_browser_process->local_state()->GetDictionary(GetWindowName().c_str());
   return dictionary &&
       dictionary->GetBoolean("always_on_top", always_on_top) && always_on_top;
 }
 
 }  // namespace
 
 namespace chrome {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
 void ShowTaskManager(Browser* browser) {
   TaskManagerView::Show(browser);
 }
 
 }  // namespace chrome