Revert "Add #ifdefs to the views/ code and move windows specific code

into their own files to get some files compiling."
Conflicts with something that went in in the interim...

Review URL: http://codereview.chromium.org/18187


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8251 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 14 deletions

diff --git a/chrome/views/focus_manager.h b/chrome/views/focus_manager.h
index b2de656..4fcd1ce 100644
--- a/chrome/views/focus_manager.h
+++ b/chrome/views/focus_manager.h
@@ -5,9 +5,7 @@
 #ifndef CHROME_VIEWS_FOCUS_MANAGER_H__
 #define CHROME_VIEWS_FOCUS_MANAGER_H__
 
-#if defined(OS_WIN)
 #include <windows.h>
-#endif
 #include <vector>
 #include <map>
 
@@ -138,10 +136,8 @@ class KeystrokeListener {
  public:
   // If this returns true, then the component handled the keystroke and ate
   // it.
-#if defined(OS_WIN)
   virtual bool ProcessKeyDown(HWND window, UINT message, WPARAM wparam,
                               LPARAM lparam) = 0;
-#endif
 };
 
 // This interface should be implemented by classes that want to be notified when
@@ -153,7 +149,6 @@ class FocusChangeListener {
 
 class FocusManager : public NotificationObserver {
  public:
-#if defined(OS_WIN)
   // Creates a FocusManager for the specified window. Top level windows
   // must invoked this when created.
   // The RootView specified should be the top RootView of the window.
@@ -172,6 +167,7 @@ class FocusManager : public NotificationObserver {
 
   static FocusManager* GetFocusManager(HWND window);
 
+
   // Message handlers (for messages received from registered windows).
   // Should return true if the message should be forwarded to the window
   // original proc function, false otherwise.
@@ -185,7 +181,6 @@ class FocusManager : public NotificationObserver {
   // OnPostActivate is called after WM_ACTIVATE has been propagated to the
   // DefWindowProc.
   bool OnPostActivate(HWND window, int activation_state, int minimized_state);
-#endif
 
   // Returns true is the specified is part of the hierarchy of the window
   // associated with this FocusManager.
@@ -207,21 +202,17 @@ class FocusManager : public NotificationObserver {
   // Note that this does not change the currently focused view.
   void ClearHWNDFocus();
 
-#if defined(OS_WIN)
   // Focus the specified |hwnd| without changing the focused view.
   void FocusHWND(HWND hwnd);
-#endif
 
   // Validates the focused view, clearing it if the window it belongs too is not
   // attached to the window hierarchy anymore.
   void ValidateFocusedView();
 
-#if defined(OS_WIN)
   // Returns the view associated with the specified window if any.
   // If |look_in_parents| is true, it goes up the window parents until it find
   // a view.
   static View* GetViewForWindow(HWND window, bool look_in_parents);
-#endif
 
   // Stores and restores the focused view. Used when the window becomes
   // active/inactive.
@@ -288,9 +279,7 @@ class FocusManager : public NotificationObserver {
       const Accelerator& accelerator) const;
 
  private:
-#if defined(OS_WIN)
   explicit FocusManager(HWND root, RootView* root_view);
-#endif
   ~FocusManager();
 
   // Returns the next focusable view.
@@ -318,10 +307,8 @@ class FocusManager : public NotificationObserver {
   // had focus.
   int stored_focused_view_storage_id_;
 
-#if defined(OS_WIN)
   // The window associated with this focus manager.
   HWND root_;
-#endif
 
   // Used to allow setting the focus on an HWND without changing the currently
   // focused view.