Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1912)

Unified Diff: chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc

Issue 10861038: Revert 152609 - Integrate invalidation API into ChromeToMobileService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc (revision 152612)
+++ chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc (working copy)
@@ -160,12 +160,16 @@
// Generate the MHTML snapshot now to report its size in the bubble.
service_->GenerateSnapshot(browser_, weak_ptr_factory_.GetWeakPtr());
+ // Request a mobile device list update.
+ service_->RequestMobileListUpdate();
+
+ const ListValue* mobiles = service_->GetMobiles();
+
GtkWidget* content = gtk_vbox_new(FALSE, 5);
gtk_container_set_border_width(GTK_CONTAINER(content), kContentBorder);
// Create and pack the title label; init the selected mobile device.
GtkWidget* title = NULL;
- const ListValue* mobiles = service_->GetMobiles();
if (mobiles->GetSize() == 1) {
string16 name;
const DictionaryValue* mobile = NULL;
@@ -320,7 +324,7 @@
const DictionaryValue* mobile = NULL;
if (mobiles->GetDictionary(selected_index, &mobile)) {
bool snapshot = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(send_copy_));
- service_->SendToMobile(mobile, snapshot ? snapshot_path_ : FilePath(),
+ service_->SendToMobile(*mobile, snapshot ? snapshot_path_ : FilePath(),
browser_, weak_ptr_factory_.GetWeakPtr());
} else {
NOTREACHED();
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698