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

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

Issue 171533007: Revert 251503 "Implement inline signin with iframe" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: 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 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 796
797 if (is_isolated) { 797 if (is_isolated) {
798 CHECK(site.has_host()); 798 CHECK(site.has_host());
799 // For extensions with isolated storage, the the host of the |site| is 799 // For extensions with isolated storage, the the host of the |site| is
800 // the |partition_domain|. The |in_memory| and |partition_name| are only 800 // the |partition_domain|. The |in_memory| and |partition_name| are only
801 // used in guest schemes so they are cleared here. 801 // used in guest schemes so they are cleared here.
802 *partition_domain = site.host(); 802 *partition_domain = site.host();
803 *in_memory = false; 803 *in_memory = false;
804 partition_name->clear(); 804 partition_name->clear();
805 } 805 }
806 } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) {
807 // Chrome signin page has an embedded iframe of extension and web content,
808 // thus it must be isolated from other webUI pages.
809 *partition_domain = chrome::kChromeUIChromeSigninHost;
810 } 806 }
811 807
812 // 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
813 // 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
814 // 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
815 // safe to continue. 811 // safe to continue.
816 CHECK(can_be_default || !partition_domain->empty()); 812 CHECK(can_be_default || !partition_domain->empty());
817 } 813 }
818 814
819 content::WebContentsViewDelegate* 815 content::WebContentsViewDelegate*
(...skipping 1886 matching lines...) Expand 10 before | Expand all | Expand 10 after
2706 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2702 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2707 // Chromium builds as well. 2703 // Chromium builds as well.
2708 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2704 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2709 #else 2705 #else
2710 return false; 2706 return false;
2711 #endif 2707 #endif
2712 } 2708 }
2713 2709
2714 2710
2715 } // namespace chrome 2711 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/extensions/signin/gaia_auth_extension_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698