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

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: enhance background.js to support multi-instances Created 6 years, 10 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.GetOrigin().spec() == kChromeUIChromeSigninURL) {
803 // Chrome signin page has an embedded iframe of extension and web content,
804 // thus it must be isolated from other webUI pages.
805 *partition_domain = chrome::kChromeUIChromeSigninHost;
802 } 806 }
803 807
804 // Assert that if |can_be_default| is false, the code above must have found a 808 // 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 809 // 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 810 // error about which StoragePartition they expect to be in and it is not
807 // safe to continue. 811 // safe to continue.
808 CHECK(can_be_default || !partition_domain->empty()); 812 CHECK(can_be_default || !partition_domain->empty());
809 } 813 }
810 814
811 content::WebContentsViewDelegate* 815 content::WebContentsViewDelegate*
(...skipping 1851 matching lines...) Expand 10 before | Expand all | Expand 10 after
2663 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2667 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2664 // Chromium builds as well. 2668 // Chromium builds as well.
2665 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2669 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2666 #else 2670 #else
2667 return false; 2671 return false;
2668 #endif 2672 #endif
2669 } 2673 }
2670 2674
2671 2675
2672 } // namespace chrome 2676 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698