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

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

Issue 173193005: Revert 251503 "Implement inline signin with iframe" (Closed) Base URL: svn://svn.chromium.org/chrome/
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 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 801
802 if (is_isolated) { 802 if (is_isolated) {
803 CHECK(site.has_host()); 803 CHECK(site.has_host());
804 // For extensions with isolated storage, the the host of the |site| is 804 // For extensions with isolated storage, the the host of the |site| is
805 // the |partition_domain|. The |in_memory| and |partition_name| are only 805 // the |partition_domain|. The |in_memory| and |partition_name| are only
806 // used in guest schemes so they are cleared here. 806 // used in guest schemes so they are cleared here.
807 *partition_domain = site.host(); 807 *partition_domain = site.host();
808 *in_memory = false; 808 *in_memory = false;
809 partition_name->clear(); 809 partition_name->clear();
810 } 810 }
811 } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) {
812 // Chrome signin page has an embedded iframe of extension and web content,
813 // thus it must be isolated from other webUI pages.
814 *partition_domain = chrome::kChromeUIChromeSigninHost;
815 } 811 }
816 812
817 // Assert that if |can_be_default| is false, the code above must have found a 813 // Assert that if |can_be_default| is false, the code above must have found a
818 // non-default partition. If this fails, the caller has a serious logic 814 // non-default partition. If this fails, the caller has a serious logic
819 // error about which StoragePartition they expect to be in and it is not 815 // error about which StoragePartition they expect to be in and it is not
820 // safe to continue. 816 // safe to continue.
821 CHECK(can_be_default || !partition_domain->empty()); 817 CHECK(can_be_default || !partition_domain->empty());
822 } 818 }
823 819
824 content::WebContentsViewDelegate* 820 content::WebContentsViewDelegate*
(...skipping 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after
2714 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2710 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2715 // Chromium builds as well. 2711 // Chromium builds as well.
2716 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2712 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2717 #else 2713 #else
2718 return false; 2714 return false;
2719 #endif 2715 #endif
2720 } 2716 }
2721 2717
2722 2718
2723 } // namespace chrome 2719 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698