Move WebUIMessageHandler to its own file in the public directory and put it in the content namesp...

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"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/aura/app_list_ui_delegate.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::WebContents;
+using content::WebUIMessageHandler;
 
 namespace {
 
 static const int kPageIdOffset = 10;
 static const int kIndexMask = (1 << kPageIdOffset) - 1;
 
 // TODO(xiyuan): Merge this with the one on ntp_resource_cache.
 string16 GetUrlWithLang(const GURL& url) {
   return ASCIIToUTF16(google_util::AppendGoogleLocaleParam(url).spec());
 }
@@ skipping 91 matching lines @@
   ExtensionService* service = GetProfile()->GetExtensionService();
   if (service)
     AddMessageHandler(new AppLauncherHandler(service));
 
   // Set up the source.
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateAppListUIHTMLSource(prefs));
 }