Merge 165818 - [Win8] Fix pin / unpin status if the user cancels an action or pins / unpins from st…

chrome/browser/ui/metro_pin_tab_helper_win.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/metro_pin_tab_helper_win.h"
 
 #include <set>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 345 matching lines @@
   // Once this happens this downloader has done its job, so delete it.
   if (in_progress_requests_.empty()) {
     scoped_refptr<PinPageTaskRunner> runner(
         new PinPageTaskRunner(title_, url_, best_candidate_));
     runner->Run();
     helper_->FaviconDownloaderFinished();
   }
 }
 
 MetroPinTabHelper::MetroPinTabHelper(content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents),
-      is_pinned_(false) {}
+    : content::WebContentsObserver(web_contents) {}
 
 MetroPinTabHelper::~MetroPinTabHelper() {}
 
+bool MetroPinTabHelper::IsPinned() const {
+  HMODULE metro_module = base::win::GetMetroModule();
+  if (!metro_module)
+    return false;
+
+  typedef BOOL (*MetroIsPinnedToStartScreen)(const string16&);
+  MetroIsPinnedToStartScreen metro_is_pinned_to_start_screen =
+      reinterpret_cast<MetroIsPinnedToStartScreen>(
+          ::GetProcAddress(metro_module, "MetroIsPinnedToStartScreen"));
+  if (!metro_is_pinned_to_start_screen) {
+    NOTREACHED();
+    return false;
+  }
+
+  GURL url = web_contents()->GetURL();
+  string16 tile_id = GenerateTileId(UTF8ToUTF16(url.spec()));
+  return metro_is_pinned_to_start_screen(tile_id) != 0;
+}
+
 void MetroPinTabHelper::TogglePinnedToStartScreen() {
-  UpdatePinnedStateForCurrentURL();
-  bool was_pinned = is_pinned_;
-
-  // TODO(benwells): This will update the state incorrectly if the user
-  // cancels. To fix this some sort of callback needs to be introduced as
-  // the pinning happens on another thread.
-  is_pinned_ = !is_pinned_;
-
-  if (was_pinned) {
+  if (IsPinned()) {
     UnPinPageFromStartScreen();
     return;
   }
 
   GURL url = web_contents()->GetURL();
   string16 url_str = UTF8ToUTF16(url.spec());
   string16 title = web_contents()->GetTitle();
   gfx::ImageSkia favicon;
   FaviconTabHelper* favicon_tab_helper = FaviconTabHelper::FromWebContents(
       web_contents());
   if (favicon_tab_helper->FaviconIsValid())
     favicon = favicon_tab_helper->GetFavicon().AsImageSkia().DeepCopy();
 
   favicon_downloader_.reset(new FaviconDownloader(this, title, url_str,
                                                   favicon));
   favicon_downloader_->Start(web_contents()->GetRenderViewHost(),
                              favicon_url_candidates_);
 }
 
 void MetroPinTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& /*details*/,
     const content::FrameNavigateParams& /*params*/) {
-  UpdatePinnedStateForCurrentURL();
   // Cancel any outstanding pin operations once the user navigates away from
   // the page.
   if (favicon_downloader_.get())
     favicon_downloader_.reset();
   // Any candidate favicons we have are now out of date so clear them.
   favicon_url_candidates_.clear();
 }
 
 bool MetroPinTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool message_handled = false;   // Allow other handlers to receive these.
@@ skipping 15 matching lines @@
     int id,
     const GURL& image_url,
     bool errored,
     int requested_size,
     const std::vector<SkBitmap>& bitmaps) {
   if (favicon_downloader_.get())
     favicon_downloader_->OnDidDownloadFavicon(id, image_url, errored,
                                               requested_size, bitmaps);
 }
 
-void MetroPinTabHelper::UpdatePinnedStateForCurrentURL() {
-  HMODULE metro_module = base::win::GetMetroModule();
-  if (!metro_module)
-    return;
-
-  typedef BOOL (*MetroIsPinnedToStartScreen)(const string16&);
-  MetroIsPinnedToStartScreen metro_is_pinned_to_start_screen =
-      reinterpret_cast<MetroIsPinnedToStartScreen>(
-          ::GetProcAddress(metro_module, "MetroIsPinnedToStartScreen"));
-  if (!metro_is_pinned_to_start_screen) {
-    NOTREACHED();
-    return;
-  }
-
-  GURL url = web_contents()->GetURL();
-  string16 tile_id = GenerateTileId(UTF8ToUTF16(url.spec()));
-  is_pinned_ = metro_is_pinned_to_start_screen(tile_id) != 0;
-}
-
 void MetroPinTabHelper::UnPinPageFromStartScreen() {
   HMODULE metro_module = base::win::GetMetroModule();
   if (!metro_module)
     return;
 
   typedef void (*MetroUnPinFromStartScreen)(const string16&);
   MetroUnPinFromStartScreen metro_un_pin_from_start_screen =
       reinterpret_cast<MetroUnPinFromStartScreen>(
           ::GetProcAddress(metro_module, "MetroUnPinFromStartScreen"));
   if (!metro_un_pin_from_start_screen) {
     NOTREACHED();
     return;
   }
 
   GURL url = web_contents()->GetURL();
   string16 tile_id = GenerateTileId(UTF8ToUTF16(url.spec()));
   metro_un_pin_from_start_screen(tile_id);
 }
 
 void MetroPinTabHelper::FaviconDownloaderFinished() {
   favicon_downloader_.reset();
 }