Get web app icon via FavIconHelper and auto repair/update

chrome/browser/browser.cc

 // Copyright (c) 2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 122 matching lines @@
     : type_(type),
       profile_(profile),
       window_(NULL),
       tabstrip_model_(this, profile),
       command_updater_(this),
       toolbar_model_(this),
       chrome_updater_factory_(this),
       is_attempting_to_close_browser_(false),
       cancel_download_confirmation_state_(NOT_PROMPTED),
       maximized_state_(MAXIMIZED_STATE_DEFAULT),
-      method_factory_(this) {
+      method_factory_(this),
+      pending_web_app_action_(NONE) {
   tabstrip_model_.AddObserver(this);
 
   registrar_.Add(this, NotificationType::SSL_VISIBLE_STATE_CHANGED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED_DISABLED,
                  NotificationService::AllSources());
@@ skipping 184 matching lines @@
   browser->AddTabWithURL(url, GURL(), PageTransition::START_PAGE, true, -1,
                          false, NULL);
 
   TabContents* tab_contents = browser->GetSelectedTabContents();
   tab_contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   tab_contents->render_view_host()->SyncRendererPrefs();
   browser->window()->Show();
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
   tab_contents->view()->SetInitialFocus();
+
+  // Set UPDATE_SHORTCUT as the pending web app action. This action is picked
+  // up in LoadingStateChanged to schedule a GetApplicationInfo. And when
+  // the web app info is available, TabContents notifies Browser via
+  // OnDidGetApplicationInfo, which calls web_app::UpdateShortcutForTabContents
+  // when it sees UPDATE_SHORTCUT as pending web app action.
+  browser->pending_web_app_action_ = UPDATE_SHORTCUT;
 }
 
 #if defined(OS_MACOSX)
 // static
 void Browser::OpenHistoryWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowHistoryTab();
   browser->window()->Show();
 }
 
@@ skipping 809 matching lines @@
   UserMetrics::RecordAction("CreateShortcut", profile_);
 #if defined(OS_WIN) || defined(OS_LINUX)
   TabContents* current_tab = GetSelectedTabContents();
   DCHECK(current_tab && web_app::IsValidUrl(current_tab->GetURL())) <<
       "Menu item should be disabled.";
 
   NavigationEntry* entry = current_tab->controller().GetLastCommittedEntry();
   if (!entry)
     return;
 
+  // RVH's GetApplicationInfo should not be called before it returns.
+  DCHECK(pending_web_app_action_ == NONE);
+  pending_web_app_action_ = CREATE_SHORTCUT;
+
   // Start fetching web app info for CreateApplicatoinShortcut dialog and
   // show the dialog when the data is available in OnDidGetApplicationInfo.
   current_tab->render_view_host()->GetApplicationInfo(entry->page_id());
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 void Browser::ToggleDevToolsWindow(bool open_console) {
   if (open_console)
@@ skipping 796 matching lines @@
 }
 
 void Browser::LoadingStateChanged(TabContents* source) {
   window_->UpdateLoadingAnimations(tabstrip_model_.TabsAreLoading());
   window_->UpdateTitleBar();
 
   if (source == GetSelectedTabContents()) {
     UpdateStopGoState(source->is_loading(), false);
     if (GetStatusBubble())
       GetStatusBubble()->SetStatus(GetSelectedTabContents()->GetStatusText());
+
+    if (!source->is_loading() &&
+        pending_web_app_action_ == UPDATE_SHORTCUT) {
+      // Schedule a shortcut update when web application info is available.
+      NavigationEntry* entry = source->controller().GetLastCommittedEntry();
+      if (entry) {
+        source->render_view_host()->GetApplicationInfo(entry->page_id());
+      } else {
+        pending_web_app_action_ = NONE;
+        NOTREACHED();
+      }      
+    }
   }
 }
 
 void Browser::CloseContents(TabContents* source) {
   if (is_attempting_to_close_browser_) {
     // If we're trying to close the browser, just clear the state related to
     // waiting for unload to fire. Don't actually try to close the tab as it
     // will go down the slow shutdown path instead of the fast path of killing
     // all the renderer processes.
     ClearUnloadState(source);
@@ skipping 227 matching lines @@
 void Browser::OnDidGetApplicationInfo(TabContents* tab_contents,
                                       int32 page_id) {
   TabContents* current_tab = GetSelectedTabContents();
   if (current_tab != tab_contents)
     return;
 
   NavigationEntry* entry = current_tab->controller().GetLastCommittedEntry();
   if (!entry || (entry->page_id() != page_id))
     return;
 
-  window()->ShowCreateShortcutsDialog(current_tab);
+  switch (pending_web_app_action_) {
+    case CREATE_SHORTCUT: {
+      window()->ShowCreateShortcutsDialog(current_tab);
+      break;
+    }
+    case UPDATE_SHORTCUT: {
+      web_app::UpdateShortcutForTabContents(current_tab);
+      break;
+    }
+    default:
+      NOTREACHED();
+      break;
+  }
+
+  pending_web_app_action_ = NONE;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, SelectFileDialog::Listener implementation:
 
 void Browser::FileSelected(const FilePath& path, int index, void* params) {
   GURL file_url = net::FilePathToFileURL(path);
   if (!file_url.is_empty())
     OpenURL(file_url, GURL(), CURRENT_TAB, PageTransition::TYPED);
 }
@@ skipping 820 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }