Remove more non-aura windows code.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1158 matching lines @@
   return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
          browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 }
 
 gfx::Rect BrowserView::GetRootWindowResizerRect() const {
   // Views does not support resizer rects because they caused page cycler
   // performance regressions when they were added. See crrev.com/9654
   return gfx::Rect();
 }
 
-void BrowserView::DisableInactiveFrame() {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  frame_->DisableInactiveRendering();
-#endif  // No tricks are needed to get the right behavior on Linux.
-}
-
 void BrowserView::ConfirmAddSearchProvider(TemplateURL* template_url,
                                            Profile* profile) {
   chrome::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL,
                            profile);
 }
 
 void BrowserView::ShowUpdateChromeDialog() {
   UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow());
 }
 
@@ skipping 125 matching lines @@
 
 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                          bool* is_keyboard_shortcut) {
   *is_keyboard_shortcut = false;
 
   if ((event.type != blink::WebInputEvent::RawKeyDown) &&
       (event.type != blink::WebInputEvent::KeyUp)) {
     return false;
   }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-  // As Alt+F4 is the close-app keyboard shortcut, it needs processing
-  // immediately.
-  if (event.windowsKeyCode == ui::VKEY_F4 &&
-      event.type == blink::WebInputEvent::RawKeyDown &&
-      event.modifiers == NativeWebKeyboardEvent::AltKey) {
-    DefWindowProc(event.os_event.hwnd, event.os_event.message,
-                  event.os_event.wParam, event.os_event.lParam);
-    return true;
-  }
-#endif
-
   views::FocusManager* focus_manager = GetFocusManager();
   DCHECK(focus_manager);
 
   if (focus_manager->shortcut_handling_suspended())
     return false;
 
   ui::Accelerator accelerator(
       static_cast<ui::KeyboardCode>(event.windowsKeyCode),
       content::GetModifiersFromNativeWebKeyboardEvent(event));
   if (event.type == blink::WebInputEvent::KeyUp)
@@ skipping 919 matching lines @@
     return is_browser_fullscreen;
   } else {
     return is_browser_fullscreen && IsBrowserTypeNormal();
   }
 #else
   return false;
 #endif
 }
 
 void BrowserView::LoadAccelerators() {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  HACCEL accelerator_table = AtlLoadAccelerators(IDR_MAINFRAME);
-  DCHECK(accelerator_table);
-
-  // We have to copy the table to access its contents.
-  int count = CopyAcceleratorTable(accelerator_table, 0, 0);
-  if (count == 0) {
-    // Nothing to do in that case.
-    return;
-  }
-
-  ACCEL* accelerators = static_cast<ACCEL*>(malloc(sizeof(ACCEL) * count));
-  CopyAcceleratorTable(accelerator_table, accelerators, count);
-
-  views::FocusManager* focus_manager = GetFocusManager();
-  DCHECK(focus_manager);
-
-  // Let's fill our own accelerator table.
-  for (int i = 0; i < count; ++i) {
-    ui::Accelerator accelerator(
-        static_cast<ui::KeyboardCode>(accelerators[i].key),
-        ui::GetModifiersFromACCEL(accelerators[i]));
-    accelerator_table_[accelerator] = accelerators[i].cmd;
-
-    // Also register with the focus manager.
-    focus_manager->RegisterAccelerator(
-        accelerator, ui::AcceleratorManager::kNormalPriority, this);
-  }
-
-  // We don't need the Windows accelerator table anymore.
-  free(accelerators);
-#else
   views::FocusManager* focus_manager = GetFocusManager();
   DCHECK(focus_manager);
 
   // Let's fill our own accelerator table.
   const bool is_app_mode = chrome::IsRunningInForcedAppMode();
   const std::vector<chrome::AcceleratorMapping> accelerator_list(
       chrome::GetAcceleratorList());
   for (std::vector<chrome::AcceleratorMapping>::const_iterator it =
            accelerator_list.begin(); it != accelerator_list.end(); ++it) {
     // In app mode, only allow accelerators of white listed commands to pass
     // through.
     if (is_app_mode && !chrome::IsCommandAllowedInAppMode(it->command_id))
       continue;
 
     ui::Accelerator accelerator(it->keycode, it->modifiers);
     accelerator_table_[accelerator] = it->command_id;
 
     // Also register with the focus manager.
     focus_manager->RegisterAccelerator(
         accelerator, ui::AcceleratorManager::kNormalPriority, this);
   }
-#endif
 }
 
 int BrowserView::GetCommandIDForAppCommandID(int app_command_id) const {
 #if defined(OS_WIN)
   switch (app_command_id) {
     // NOTE: The order here matches the APPCOMMAND declaration order in the
     // Windows headers.
     case APPCOMMAND_BROWSER_BACKWARD: return IDC_BACK;
     case APPCOMMAND_BROWSER_FORWARD:  return IDC_FORWARD;
     case APPCOMMAND_BROWSER_REFRESH:  return IDC_RELOAD;
@@ skipping 271 matching lines @@
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }