Coalesce event router Init calls into their constructors.

chrome/browser/extensions/window_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/window_event_router.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_service.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/base/x/active_window_watcher_x.h"
 #endif
 
 namespace event_names = extensions::event_names;
 
 namespace extensions {
 
 WindowEventRouter::WindowEventRouter(Profile* profile)
-    : initialized_(false),
-      profile_(profile),
+    : profile_(profile),
       focused_profile_(NULL),
       focused_window_id_(extension_misc::kUnknownWindowId) {
   DCHECK(!profile->IsOffTheRecord());
-}
-
-WindowEventRouter::~WindowEventRouter() {
-  if (initialized_) {
-    WindowControllerList::GetInstance()->RemoveObserver(this);
-#if defined(TOOLKIT_VIEWS)
-    views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
-#elif defined(TOOLKIT_GTK)
-    ui::ActiveWindowWatcherX::RemoveObserver(this);
-#endif
-  }
-}
-
-void WindowEventRouter::Init() {
-  if (initialized_)
-    return;
 
   WindowControllerList::GetInstance()->AddObserver(this);
 #if defined(TOOLKIT_VIEWS)
   views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
 #elif defined(TOOLKIT_GTK)
   ui::ActiveWindowWatcherX::AddObserver(this);
 #elif defined(OS_MACOSX)
   // Needed for when no suitable window can be passed to an extension as the
   // currently focused window.
   registrar_.Add(this, chrome::NOTIFICATION_NO_KEY_WINDOW,
                  content::NotificationService::AllSources());
 #endif
+}
 
-  initialized_ = true;
+WindowEventRouter::~WindowEventRouter() {
+  WindowControllerList::GetInstance()->RemoveObserver(this);
+#if defined(TOOLKIT_VIEWS)
+  views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
+#elif defined(TOOLKIT_GTK)
+  ui::ActiveWindowWatcherX::RemoveObserver(this);
+#endif
 }
 
 void WindowEventRouter::OnWindowControllerAdded(
     WindowController* window_controller) {
   if (!profile_->IsSameProfile(window_controller->profile()))
     return;
 
   scoped_ptr<base::ListValue> args(new ListValue());
   DictionaryValue* window_dictionary = window_controller->CreateWindowValue();
   args->Append(window_dictionary);
@@ skipping 87 matching lines @@
 }
 
 void WindowEventRouter::DispatchEvent(const char* event_name,
                                       Profile* profile,
                                       scoped_ptr<base::ListValue> args) {
   ExtensionSystem::Get(profile)->event_router()->
       DispatchEventToRenderers(event_name, args.Pass(), profile, GURL());
 }
 
 }  // namespace extensions