[Aura] Polish app list.

chrome/browser/ui/webui/aura/app_list_ui.cc

 // Copyright (c) 2011 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/ui/webui/aura/app_list_ui.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 58 matching lines @@
   int shown_page = prefs->GetInteger(prefs::kNTPShownPage);
   localized_strings.SetInteger("shown_page_type", shown_page & ~kIndexMask);
   localized_strings.SetInteger("shown_page_index", shown_page & kIndexMask);
 
   source->AddLocalizedStrings(localized_strings);
   source->set_json_path("strings.js");
   source->set_default_resource(IDR_APP_LIST_HTML);
   return source;
 }
 
+class AppListHandler : public WebUIMessageHandler {
+ public:
+  AppListHandler() {}
+  virtual ~AppListHandler() {}
+
+  // WebUIMessageHandler
+  virtual void RegisterMessages() OVERRIDE;
+
+ private:
+  AppListUI* app_list_ui() const {
+    return static_cast<AppListUI*>(web_ui_);
+  }
+
+  void HandleClose(const base::ListValue* args);
+  void HandleAppsLoaded(const base::ListValue* args);
+
+  DISALLOW_COPY_AND_ASSIGN(AppListHandler);
+};
+
+void AppListHandler::RegisterMessages() {
+  web_ui_->RegisterMessageCallback("close",
+      base::Bind(&AppListHandler::HandleClose, base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("onAppsLoaded",
+      base::Bind(&AppListHandler::HandleAppsLoaded, base::Unretained(this)));
+}
+
+void AppListHandler::HandleClose(const base::ListValue* args) {
+  app_list_ui()->delegate()->Close();

[sky, 2011/11/30 21:50:21]

Might the delegate be NULL here and on 110?

[xiyuan, 2011/11/30 22:26:34]

It should never be NULL. Added a DCHECK to catch this.

+}
+
+void AppListHandler::HandleAppsLoaded(const base::ListValue* args) {
+  app_list_ui()->delegate()->OnAppsLoaded();
+}
+
 }  // namespace
 
 AppListUI::AppListUI(TabContents* contents)
-    : ChromeWebUI(contents) {
+    : ChromeWebUI(contents),
+      delegate_(NULL) {
+  AddMessageHandler((new AppListHandler)->Attach(this));
+
   ExtensionService* service = GetProfile()->GetExtensionService();
   if (service)
     AddMessageHandler((new AppLauncherHandler(service))->Attach(this));
 
   // Set up the source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   PrefService* prefs = profile->GetPrefs();
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateAppListUIHTMLSource(prefs));
 }