Reverting 18872.

views/widget/widget_win.h

 // Copyright (c) 2006-2008 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 VIEWS_WIDGET_WIDGET_WIN_H_
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 60 matching lines @@
   WidgetWin();
   virtual ~WidgetWin();
 
   // Initialize the Widget with a parent and an initial desired size.
   // |contents_view| is the view that will be the single child of RootView
   // within this Widget. As contents_view is inserted into RootView's tree,
   // RootView assumes ownership of this view and cleaning it up. If you remove
   // this view, you are responsible for its destruction. If this value is NULL,
   // the caller is responsible for populating the RootView, and sizing its
   // contents as the window is sized.
-  void Init(HWND parent, const gfx::Rect& bounds);
+  // If |has_own_focus_manager| is true, the focus traversal stay confined to
+  // the window.
+  void Init(HWND parent,
+            const gfx::Rect& bounds,
+            bool has_own_focus_manager);
 
   // Sets the specified view as the contents of this Widget. There can only
   // be one contnets view child of this Widget's RootView. This view is sized to
   // fit the entire size of the RootView. The RootView takes ownership of this
   // View, unless it is set as not being parent-owned.
   virtual void SetContentsView(View* view);
 
   // Sets the window styles. This is ONLY used when the window is created.
   // In other words, if you invoke this after invoking Init, nothing happens.
   void set_window_style(DWORD style) { window_style_ = style; }
@@ skipping 19 matching lines @@
   void SetUseLayeredBuffer(bool use_layered_buffer);
 
   // Disable Layered Window updates by setting to false.
   void set_can_update_layered_window(bool can_update_layered_window) {
     can_update_layered_window_ = can_update_layered_window;
   }
 
   // Returns the RootView associated with the specified HWND (if any).
   static RootView* FindRootView(HWND hwnd);
 
-  // Returns the Widget associated with the specified HWND (if any).
-  static WidgetWin* GetWidget(HWND hwnd);
-
   // All classes registered by WidgetWin start with this name.
   static const wchar_t* const kBaseClassName;
 
   BEGIN_MSG_MAP_EX(0)
     // Range handlers must go first!
     MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange)
     MESSAGE_RANGE_HANDLER_EX(WM_NCMOUSEMOVE, WM_NCMOUSEMOVE, OnMouseRange)
 
     // Reflected message handler
     MESSAGE_HANDLER_EX(kReflectedMessage, OnReflectedMessage)
@@ skipping 88 matching lines @@
   virtual void PaintNow(const gfx::Rect& update_rect);
   virtual void SetOpacity(unsigned char opacity);
   virtual RootView* GetRootView();
   virtual Widget* GetRootWidget() const;
   virtual bool IsVisible() const;
   virtual bool IsActive() const;
   virtual TooltipManager* GetTooltipManager();
   virtual ThemeProvider* GetThemeProvider() const;
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
-  virtual FocusManager* GetFocusManager();
 
   // Overridden from MessageLoop::Observer:
   void WillProcessMessage(const MSG& msg);
   virtual void DidProcessMessage(const MSG& msg);
 
   // Overridden from FocusTraversable:
   virtual View* FindNextFocusableView(View* starting_view,
                                       bool reverse,
                                       Direction direction,
                                       bool check_starting_view,
@@ skipping 77 matching lines @@
 
   // Resets the last move flag so that we can go around the optimization
   // that disregards duplicate mouse moves when ending animation requires
   // a new hit-test to do some highlighting as in TabStrip::RemoveTabAnimation
   // to cause the close button to highlight.
   void ResetLastMouseMoveFlag() {
     last_mouse_event_was_move_ = false;
   }
 
  protected:
+
   // Call close instead of this to Destroy the window.
   BOOL DestroyWindow() {
     DCHECK(::IsWindow(GetNativeView()));
     return ::DestroyWindow(GetNativeView());
   }
 
   // Message Handlers
   // These are all virtual so that specialized Widgets can modify or augment
   // processing.
   // This list is in _ALPHABETICAL_ order!
@@ skipping 175 matching lines @@
   bool opaque() const { return opaque_; }
 
   // The TooltipManager.
   // WARNING: RootView's destructor calls into the TooltipManager. As such, this
   // must be destroyed AFTER root_view_. This really only matters during
   // WM_SESSIONEND, as normally the hwnd is destroyed which tiggers unsetting
   // the widget in the RootView so that RootView's destructor doesn't call into
   // the TooltipManager.
   scoped_ptr<TooltipManagerWin> tooltip_manager_;
 
-  // The focus manager keeping track of focus for this Widget and any of its
-  // children.  NULL for non top-level widgets.
-  // WARNING: RootView's destructor calls into the FocusManager. As such, this
-  // must be destroyed AFTER root_view_.
-  scoped_ptr<FocusManager> focus_manager_;
-
   // The root of the View hierarchy attached to this window.
   // WARNING: see warning in tooltip_manager_ for ordering dependencies with
   // this and tooltip_manager_.
   scoped_ptr<RootView> root_view_;
 
   // Whether or not we have capture the mouse.
   bool has_capture_;
 
   // If true, the mouse is currently down.
   bool is_mouse_down_;
@@ skipping 101 matching lines @@
 
   scoped_ptr<DefaultThemeProvider> default_theme_provider_;
 
   // Our hwnd.
   HWND hwnd_;
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_WIDGET_WIDGET_WIN_H_