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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 130963006: Reimplement inline signin with iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 792
793 if (is_isolated) { 793 if (is_isolated) {
794 CHECK(site.has_host()); 794 CHECK(site.has_host());
795 // For extensions with isolated storage, the the host of the |site| is 795 // For extensions with isolated storage, the the host of the |site| is
796 // the |partition_domain|. The |in_memory| and |partition_name| are only 796 // the |partition_domain|. The |in_memory| and |partition_name| are only
797 // used in guest schemes so they are cleared here. 797 // used in guest schemes so they are cleared here.
798 *partition_domain = site.host(); 798 *partition_domain = site.host();
799 *in_memory = false; 799 *in_memory = false;
800 partition_name->clear(); 800 partition_name->clear();
801 } 801 }
802 } else if (site.SchemeIs(chrome::kChromeUIScheme) &&
803 site.host() == chrome::kChromeUIChromeSigninHost) {
jam 2014/01/26 02:51:46 nit: site.GetOrigin().spec() == kChromeUIChromeSig
guohui 2014/01/29 12:50:51 Done.
804 // Chrome signin page has an embedded iframe of extension and web content,
805 // thus it must be isolated from other webUI pages.
806 *partition_domain = chrome::kChromeUIChromeSigninHost;
802 } 807 }
803 808
804 // Assert that if |can_be_default| is false, the code above must have found a 809 // Assert that if |can_be_default| is false, the code above must have found a
805 // non-default partition. If this fails, the caller has a serious logic 810 // non-default partition. If this fails, the caller has a serious logic
806 // error about which StoragePartition they expect to be in and it is not 811 // error about which StoragePartition they expect to be in and it is not
807 // safe to continue. 812 // safe to continue.
808 CHECK(can_be_default || !partition_domain->empty()); 813 CHECK(can_be_default || !partition_domain->empty());
809 } 814 }
810 815
811 content::WebContentsViewDelegate* 816 content::WebContentsViewDelegate*
(...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after
2661 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2666 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2662 // Chromium builds as well. 2667 // Chromium builds as well.
2663 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2668 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2664 #else 2669 #else
2665 return false; 2670 return false;
2666 #endif 2671 #endif
2667 } 2672 }
2668 2673
2669 2674
2670 } // namespace chrome 2675 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698