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

Side by Side Diff: chrome/browser/ui/intents/web_intent_picker_controller.cc

Issue 10831116: Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix content shell 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" 5 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 picker_model_->SetInlineDisposition(url); 304 picker_model_->SetInlineDisposition(url);
305 break; 305 break;
306 306
307 case WebIntentPickerModel::DISPOSITION_WINDOW: { 307 case WebIntentPickerModel::DISPOSITION_WINDOW: {
308 Browser* browser = browser::FindBrowserWithWebContents( 308 Browser* browser = browser::FindBrowserWithWebContents(
309 tab_contents_->web_contents()); 309 tab_contents_->web_contents());
310 TabContents* contents = chrome::TabContentsFactory( 310 TabContents* contents = chrome::TabContentsFactory(
311 tab_contents_->profile(), 311 tab_contents_->profile(),
312 tab_util::GetSiteInstanceForNewTab( 312 tab_util::GetSiteInstanceForNewTab(
313 tab_contents_->profile(), url), 313 tab_contents_->profile(), url),
314 MSG_ROUTING_NONE, NULL, NULL); 314 MSG_ROUTING_NONE, NULL);
315 315
316 // Let the controller for the target TabContents know that it is hosting a 316 // Let the controller for the target TabContents know that it is hosting a
317 // web intents service. 317 // web intents service.
318 contents->web_intent_picker_controller()->SetWindowDispositionSource( 318 contents->web_intent_picker_controller()->SetWindowDispositionSource(
319 tab_contents_->web_contents(), intents_dispatcher_); 319 tab_contents_->web_contents(), intents_dispatcher_);
320 320
321 intents_dispatcher_->DispatchIntent(contents->web_contents()); 321 intents_dispatcher_->DispatchIntent(contents->web_contents());
322 service_tab_ = contents->web_contents(); 322 service_tab_ = contents->web_contents();
323 323
324 // This call performs all the tab strip manipulation, notifications, etc. 324 // This call performs all the tab strip manipulation, notifications, etc.
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 // If picker is non-NULL, it was set by a test. 768 // If picker is non-NULL, it was set by a test.
769 if (picker_ == NULL) 769 if (picker_ == NULL)
770 picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get()); 770 picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get());
771 picker_shown_ = true; 771 picker_shown_ = true;
772 } 772 }
773 773
774 void WebIntentPickerController::ClosePicker() { 774 void WebIntentPickerController::ClosePicker() {
775 if (picker_) 775 if (picker_)
776 picker_->Close(); 776 picker_->Close();
777 } 777 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698