Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/ui/views/task_manager_view.cc

 // Copyright (c) 2011 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/utf_string_conversions.h"
@@ skipping 593 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(),
                                   WideToUTF8(GetWindowName()).c_str());
       DictionaryValue* window_preferences = update.Get();
       window_preferences->SetBoolean("always_on_top", is_always_on_top_);
     }
     return true;
   }
+#endif

[sky, 2011/09/06 17:22:48]

#else NOTIMPLEMENTED?

   return false;
 }
 
 std::wstring TaskManagerView::GetWindowTitle() const {
   return UTF16ToWide(l10n_util::GetStringUTF16(IDS_TASK_MANAGER_TITLE));
 }
 
 std::wstring TaskManagerView::GetWindowName() const {
   return UTF8ToWide(prefs::kTaskManagerWindowPlacement);
 }
@@ skipping 76 matching lines @@
   int row_count = tab_table_->RowCount();
   for (int i = 0; i < row_count; ++i) {
     if (tab_table_->ItemHasTheFocus(i)) {
       task_manager_->ActivateProcess(i);
       break;
     }
   }
 }
 
 void TaskManagerView::AddAlwaysOnTopSystemMenuItem() {
+#if defined(OS_WIN) && !defined(USE_AURA)
   // The Win32 API requires that we own the text.
   always_on_top_menu_text_ =
       UTF16ToWide(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

[sky, 2011/09/06 17:22:48]

#else NOTIMPLEMENTED?

 }
 
 bool TaskManagerView::GetSavedAlwaysOnTopState(bool* always_on_top) const {
   if (!g_browser_process->local_state())
     return false;
 
   const DictionaryValue* dictionary =
       g_browser_process->local_state()->GetDictionary(
           WideToUTF8(GetWindowName()).c_str());
   return dictionary &&
       dictionary->GetBoolean("always_on_top", always_on_top) && always_on_top;
 }
 
 }  // namespace
 
 namespace browser {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
 void ShowTaskManager() {
   TaskManagerView::Show(false);
 }
 
 void ShowBackgroundPages() {
   TaskManagerView::Show(true);
 }
 
 }  // namespace browser