MacViews: Change TOOLKIT_VIEWS to !OS_MACOSX in extensions::WindowsEventRouter

chrome/browser/extensions/api/tabs/windows_event_router.cc

 // Copyright (c) 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/extensions/api/tabs/windows_event_router.h"
 
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 12 matching lines @@
 
 namespace windows = extensions::api::windows;
 
 WindowsEventRouter::WindowsEventRouter(Profile* profile)
     : profile_(profile),
       focused_profile_(NULL),
       focused_window_id_(extension_misc::kUnknownWindowId) {
   DCHECK(!profile->IsOffTheRecord());
 
   WindowControllerList::GetInstance()->AddObserver(this);
-#if defined(TOOLKIT_VIEWS)
-  views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
-#elif defined(OS_MACOSX)
   // Needed for when no suitable window can be passed to an extension as the
-  // currently focused window.
+  // currently focused window. On Mac (event in a toolkit-views build) always

[not at google - send to devlin, 2014/12/12 16:37:22]

event -> even?

[tapted, 2014/12/15 22:20:45]

Whoops - Done.

+  // rely on the notification sent by AppControllerMac after AppKit sends
+  // NSWindowDidBecomeKeyNotification and there is no [NSApp keyWindow]. This
+  // allows windows not created by toolkit-views to be tracked.
+  // TODO(tapted): Remove the ifdefs (and NOTIFICATION_NO_KEY_WINDOW) when
+  // Chrome on Mac only makes windows with toolkit-views.
+#if defined(OS_MACOSX)
   registrar_.Add(this, chrome::NOTIFICATION_NO_KEY_WINDOW,
                  content::NotificationService::AllSources());
+#elif defined(TOOLKIT_VIEWS)
+  views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
+#else
+#error Unsupported
 #endif
 }
 
 WindowsEventRouter::~WindowsEventRouter() {
   WindowControllerList::GetInstance()->RemoveObserver(this);
-#if defined(TOOLKIT_VIEWS)
+#if !defined(OS_MACOSX)
   views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
 #endif
 }
 
 void WindowsEventRouter::OnWindowControllerAdded(
     WindowController* window_controller) {
   if (!profile_->IsSameProfile(window_controller->profile()))
     return;
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
@@ skipping 10 matching lines @@
     return;
 
   int window_id = window_controller->GetWindowId();
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Append(new base::FundamentalValue(window_id));
   DispatchEvent(windows::OnRemoved::kEventName,
                 window_controller->profile(),
                 args.Pass());
 }
 
-#if defined(TOOLKIT_VIEWS)
+#if !defined(OS_MACOSX)
 void WindowsEventRouter::OnNativeFocusChange(
     gfx::NativeView focused_before,
     gfx::NativeView focused_now) {
   if (!focused_now)
     OnActiveWindowChanged(NULL);
 }
 #endif
 
 void WindowsEventRouter::Observe(
     int type,
@@ skipping 56 matching lines @@
 
 void WindowsEventRouter::DispatchEvent(const std::string& event_name,
                                       Profile* profile,
                                       scoped_ptr<base::ListValue> args) {
   scoped_ptr<Event> event(new Event(event_name, args.Pass()));
   event->restrict_to_browser_context = profile;
   EventRouter::Get(profile)->BroadcastEvent(event.Pass());
 }
 
 }  // namespace extensions