app_list: Drive app integration.

chrome/browser/apps/drive/drive_app_converter.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 "chrome/browser/ui/app_list/drive/drive_app_converter.h"
+#include "chrome/browser/apps/drive/drive_app_converter.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/image_decoder.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using content::BrowserThread;
 
+namespace extensions {
+
 // IconFetcher downloads |icon_url| using |converter|'s profile. The icon
 // url is passed from a DriveAppInfo and should follow icon url definition
 // in Drive API:
 //   https://developers.google.com/drive/v2/reference/apps#resource
 // Each icon url represents a single image associated with a certain size.
 class DriveAppConverter::IconFetcher : public net::URLFetcherDelegate,
                                        public ImageDecoder::Delegate {
  public:
   IconFetcher(DriveAppConverter* converter,
               const GURL& icon_url,
@@ skipping 69 matching lines @@
       app_(NULL),
       finished_callback_(finished_callback) {
   DCHECK(profile_);
 }
 
 DriveAppConverter::~DriveAppConverter() {
   PostInstallCleanUp();
 }
 
 void DriveAppConverter::Start() {
-  if (app_info_.app_name.empty() ||
-      !app_info_.create_url.is_valid()) {
+  DCHECK(!IsStarted());
+
+  if (app_info_.app_name.empty() || !app_info_.create_url.is_valid()) {
     finished_callback_.Run(this, false);
     return;
   }
 
   web_app_.title = base::UTF8ToUTF16(app_info_.app_name);
   web_app_.app_url = app_info_.create_url;
 
   const std::set<int> allowed_sizes(extension_misc::kExtensionIconSizes,
                                     extension_misc::kExtensionIconSizes +
                                         extension_misc::kNumExtensionIconSizes);
   std::set<int> pending_sizes;
   for (size_t i = 0; i < app_info_.app_icons.size(); ++i) {
     const int icon_size = app_info_.app_icons[i].first;
     if (allowed_sizes.find(icon_size) == allowed_sizes.end() ||
         pending_sizes.find(icon_size) != pending_sizes.end()) {
       continue;
     }
 
     pending_sizes.insert(icon_size);
     const GURL& icon_url = app_info_.app_icons[i].second;
     IconFetcher* fetcher = new IconFetcher(this, icon_url, icon_size);
     fetchers_.push_back(fetcher);  // Pass ownership to |fetchers|.
     fetcher->Start();
   }
 
   if (fetchers_.empty())
     StartInstall();
 }
 
+bool DriveAppConverter::IsStarted() const {
+  return !fetchers_.empty() || crx_installer_;
+}
+
 void DriveAppConverter::OnIconFetchComplete(const IconFetcher* fetcher) {
   const SkBitmap& icon = fetcher->icon();
   if (!icon.empty() && icon.width() != 0) {
     WebApplicationInfo::IconInfo icon_info;
     icon_info.url = fetcher->icon_url();
     icon_info.data = icon;
     icon_info.width = icon.width();
     icon_info.height = icon.height();
     web_app_.icons.push_back(icon_info);
   }
 
   fetchers_.erase(std::find(fetchers_.begin(), fetchers_.end(), fetcher));
 
   if (fetchers_.empty())
     StartInstall();
 }
 
 void DriveAppConverter::StartInstall() {
   DCHECK(!crx_installer_);
-  crx_installer_ = extensions::CrxInstaller::CreateSilent(
-      extensions::ExtensionSystem::Get(profile_)->extension_service());
-  extensions::InstallTracker::Get(profile_)->AddObserver(this);
+  crx_installer_ = CrxInstaller::CreateSilent(
+      ExtensionSystem::Get(profile_)->extension_service());
+
+  // Sets WAS_INSTALLED_BY_DEFAULT to make the converted url app not syncable.
+  // Drive apps goes with the user's account and url apps will be created when

[benwells, 2014/06/05 01:24:39]

Nit: goes -> go

[xiyuan, 2014/06/05 17:48:32]

Done.

+  // needed. Syncing those apps could hit an edge case where the synced url
+  // apps become orphans when the user has corresponding chrome apps.
+  crx_installer_->set_creation_flags(Extension::FROM_BOOKMARK |
+                                     Extension::WAS_INSTALLED_BY_DEFAULT);
+
+  InstallTracker::Get(profile_)->AddObserver(this);
   crx_installer_->InstallWebApp(web_app_);
 }
 
 void DriveAppConverter::PostInstallCleanUp() {
   if (!crx_installer_)
     return;
 
-  extensions::InstallTracker::Get(profile_)->RemoveObserver(this);
+  InstallTracker::Get(profile_)->RemoveObserver(this);
   crx_installer_ = NULL;
 }
 
 void DriveAppConverter::OnFinishCrxInstall(const std::string& extension_id,
                                            bool success) {
   if (!crx_installer_->extension() ||
       crx_installer_->extension()->id() != extension_id) {
     return;
   }
 
   app_ = crx_installer_->extension();
+  PostInstallCleanUp();
+
   finished_callback_.Run(this, success);
+  // |finished_callback_| could delete this.
+}
 
-  PostInstallCleanUp();
-}
+}  // namespace extensions