Get FileSelect dialog work on athena

athena/activity/activity_manager_impl.cc

 // Copyright 2014 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 "athena/activity/activity_manager_impl.h"
 
 #include <algorithm>
 
 #include "athena/activity/activity_widget_delegate.h"
 #include "athena/activity/public/activity.h"
@@ skipping 67 matching lines @@
     widget->Close();
   }
 }
 
 void ActivityManagerImpl::UpdateActivity(Activity* activity) {
   views::Widget* widget = GetWidget(activity);
   widget->UpdateWindowIcon();
   widget->UpdateWindowTitle();
 }
 
+Activity* ActivityManagerImpl::GetActivityForWindow(aura::Window* window) {
+  struct Matcher {
+    Matcher(aura::Window* w) : window(w) {}
+    bool operator()(Activity* activity) {
+      return activity->GetWindow() == window;
+    }
+    aura::Window* window;
+  };
+  std::vector<Activity*>::iterator iter =
+      std::find_if(activities_.begin(), activities_.end(), Matcher(window));
+  return iter != activities_.end() ? *iter : NULL;
+}
+
 void ActivityManagerImpl::AddObserver(ActivityManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ActivityManagerImpl::RemoveObserver(ActivityManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void ActivityManagerImpl::OnWidgetDestroying(views::Widget* widget) {
-  struct Matcher {
-    Matcher(aura::Window* w) : window(w) {}
-
-    bool operator()(Activity* activity) {
-      return activity->GetWindow() == window;
-    }
-    aura::Window* window;
-  };
-  std::vector<Activity*>::iterator iter =
-      std::find_if(activities_.begin(),
-                   activities_.end(),
-                   Matcher(widget->GetNativeWindow()));
-  DCHECK(iter != activities_.end());
-  if (iter != activities_.end()) {
+  Activity* activity = GetActivityForWindow(widget->GetNativeWindow());
+  if (activity) {
     widget->RemoveObserver(this);
-    Activity::Delete(*iter);
+    Activity::Delete(activity);
   }
 }
 
 // static
 ActivityManager* ActivityManager::Create() {
   new ActivityManagerImpl();
   CHECK(instance);
   return instance;
 }
 
 ActivityManager* ActivityManager::Get() {
   return instance;
 }
 
 void ActivityManager::Shutdown() {
   CHECK(instance);
   delete instance;
 }
 
 
 }  // namespace athena