Merge 32335...

chrome/browser/views/extensions/extension_view.h

 // Copyright (c) 2006-2009 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.
 
 #ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
 #define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
 
 #include "build/build_config.h"
 
 #include "base/scoped_ptr.h"
@@ skipping 48 matching lines @@
   // Overridden from views::NativeViewHost:
   virtual void SetVisible(bool is_visible);
   virtual void DidChangeBounds(const gfx::Rect& previous,
                                const gfx::Rect& current);
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View *parent, views::View *child);
 
  protected:
   // Overridden from views::View.
   virtual void PreferredSizeChanged();
+  virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e);
 
  private:
   friend class ExtensionHost;
 
   // Initializes the RenderWidgetHostView for this object.
   void CreateWidgetHostView();
 
   // We wait to show the ExtensionView until several things have loaded.
   void ShowIfCompletelyLoaded();
 
@@ skipping 23 matching lines @@
   // Note: the view does not own its container.
   Container* container_;
 
   // Whether this extension view is clipped.
   bool is_clipped_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_