Mac Web Intents Part 1: Show extension download progress

chrome/browser/ui/intents/web_intent_picker_model.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/intents/web_intent_picker_model.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 const size_t kMaxSuggestionCount = 5;  // Maximum number of visible suggestions.
 
 }  // namespace
 
 WebIntentPickerModel::WebIntentPickerModel()
     : observer_(NULL),
       waiting_for_suggestions_(true),
-      default_service_hash_(0) {
+      default_service_hash_(0),
+      pending_install_download_percent_(0) {

[Steve McKay, 2012/09/25 18:56:04]

pending_install_download_percent_ > pending_install_download_progress_, then
just document legal values as 00-99 where the field is declared.

[sail, 2012/10/02 18:57:01]

Done.

 }
 
 WebIntentPickerModel::~WebIntentPickerModel() {
   DestroyAll();
 }
 
 void WebIntentPickerModel::AddInstalledService(
     const string16& title,
     const GURL& url,
     webkit_glue::WebIntentServiceData::Disposition disposition) {
@@ skipping 17 matching lines @@
   if (observer_)
     observer_->OnModelChanged(this);
 }
 
 void WebIntentPickerModel::Clear() {
   DestroyAll();
   action_.clear();
   type_.clear();
   inline_disposition_url_ = GURL::EmptyGURL();
   waiting_for_suggestions_ = true;
+  ClearPendingInstall();

[Steve McKay, 2012/09/25 18:56:04]

There are a lot of things at play in the picker. I think you should qualify all
Extension specific fields/methods with the work "Extension".

ClearPendingExtensionInstall.

[sail, 2012/10/02 18:57:01]

Done.
Updated all the other fields as well.

   if (observer_)
     observer_->OnModelChanged(this);
 }
 
 const WebIntentPickerModel::InstalledService&
     WebIntentPickerModel::GetInstalledServiceAt(size_t index) const {
   DCHECK_LT(index, installed_services_.size());
   return *installed_services_[index];
 }
 
@@ skipping 78 matching lines @@
 bool WebIntentPickerModel::IsWaitingForSuggestions() const {
   return waiting_for_suggestions_;
 }
 
 void WebIntentPickerModel::SetWaitingForSuggestions(bool waiting) {
   waiting_for_suggestions_ = waiting;
   if (observer_)
     observer_->OnModelChanged(this);
 }
 
+void WebIntentPickerModel::SetPendingInstallExtensionId(const std::string& id) {
+  pending_install_extension_id_ = id;
+  if (observer_)
+    observer_->OnModelChanged(this);
+}
+
+void WebIntentPickerModel::SetPendingInstallDownloadPercent(int percent) {
+  pending_install_download_percent_ = percent;
+  if (observer_)
+    observer_->OnModelChanged(this);

[groby-ooo-7-16, 2012/09/25 22:20:56]

Pre your refactor, OnModelChanged used to trigger a performLayout, which used to
be a bit extensive. (I.e. visual artifacts). Is that fixed?

[sail, 2012/10/02 18:57:01]

Yea, it's really cheap now and I don't see any visual artifacts. On my MacBook
Pro extra layouts (that don't change the content) take almost no time (rounded
to 0 miliseconds).

+}
+
+void WebIntentPickerModel::SetPendingInstallStatusString(
+    const string16& status) {
+  pending_install_status_string_ = status;
+  if (observer_)
+    observer_->OnModelChanged(this);
+}
+
+void WebIntentPickerModel::ClearPendingInstall() {
+  pending_install_extension_id_.clear();
+  pending_install_download_percent_ = 0;
+  pending_install_status_string_.clear();
+  if (observer_)
+    observer_->OnModelChanged(this);
+}
+
 void WebIntentPickerModel::DestroyAll() {
   STLDeleteElements(&installed_services_);
 }
 
 WebIntentPickerModel::InstalledService::InstalledService(
     const string16& title,
     const GURL& url,
     webkit_glue::WebIntentServiceData::Disposition disposition)
     : title(title),
       url(url),
@@ skipping 11 matching lines @@
     double average_rating)
     : title(title),
       id(id),
       average_rating(average_rating),
       icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_DEFAULT_FAVICON)) {
 }
 
 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() {
 }