chromeos: Make Chrome app a real app.

chrome/browser/ui/views/ash/app_list/search_builder.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/ui/views/ash/app_list/search_builder.h"
 
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
@@ skipping 56 matching lines @@
     tag_start = text_class.offset;
     tag_styles = ACMatchStyleToTagStyle(text_class.style);
   }
 
   if (tag_styles != app_list::SearchResult::Tag::NONE) {
     tags->push_back(app_list::SearchResult::Tag(
         tag_styles, tag_start, text.length()));
   }
 }
 
+const extensions::Extension* GetExtensionByURL(Profile* profile,
+                                               const GURL& url) {
+  ExtensionService* service = profile->GetExtensionService();
+  // Need to explicitly get chrome app because it does not override new tab and
+  // not having a web extent to include new tab url, thus GetInstalledApp does
+  // not find it.
+  return url.spec() == chrome::kChromeUINewTabURL ?
+      service->extensions()->GetByID(extension_misc::kChromeAppId) :
+      service->GetInstalledApp(url);
+}
+
 // SearchBuildResult is an app list SearchResult built from an
 // AutocompleteMatch.
 class SearchBuilderResult : public app_list::SearchResult,
                             public ImageLoadingTracker::Observer {
  public:
   SearchBuilderResult(Profile* profile,
                       const AutocompleteMatch& match)
       : profile_(profile),
         match_(match) {
     UpdateIcon();
     UpdateTitleAndDetails();
   }
 
   const AutocompleteMatch& match() const {
     return match_;
   }
 
  private:
   void UpdateIcon() {
     if (match_.type == AutocompleteMatch::EXTENSION_APP) {
-      ExtensionService* service = profile_->GetExtensionService();
       const extensions::Extension* extension =
-          service->GetInstalledApp(match_.destination_url);
+          GetExtensionByURL(profile_, match_.destination_url);
       if (extension) {
         LoadExtensionIcon(extension);
         return;
       }
     }
 
     int resource_id = match_.starred ?
         IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type);
     SetIcon(*ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
         resource_id));
@@ skipping 103 matching lines @@
     apps_provider_->Stop();
 }
 
 void SearchBuilder::OpenResult(const app_list::SearchResult& result,
                                int event_flags) {
   const SearchBuilderResult* builder_result =
       static_cast<const SearchBuilderResult*>(&result);
   const AutocompleteMatch& match = builder_result->match();
 
   if (match.type == AutocompleteMatch::EXTENSION_APP) {
-    ExtensionService* service = profile_->GetExtensionService();
     const extensions::Extension* extension =
-        service->GetInstalledApp(match.destination_url);
+        GetExtensionByURL(profile_, match.destination_url);
     if (extension)
       extension_utils::OpenExtension(profile_, extension, event_flags);
   } else {
     WindowOpenDisposition disposition =
         browser::DispositionFromEventFlags(event_flags);
     Browser* browser = browser::FindOrCreateTabbedBrowser(profile_);
 
     if (disposition == CURRENT_TAB) {
       // If current tab is not NTP, change disposition to NEW_FOREGROUND_TAB.
       const GURL& url = browser->GetActiveWebContents() ?
@@ skipping 21 matching lines @@
        ++it) {
     results_->Add(new SearchBuilderResult(profile_, *it));
   }
 }
 
 void SearchBuilder::OnResultChanged(bool default_match_changed) {
   // TODO(xiyuan): Handle default match properly.
   const AutocompleteResult& ac_result = controller_->result();
   PopulateFromACResult(ac_result);
 }