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

Side by Side Diff: chrome/browser/extensions/extensions_ui.cc

Issue 7492051: Revert 94332 - Removal of Profile from content part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extensions/extensions_ui.h" 5 #include "chrome/browser/extensions/extensions_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 continue; 750 continue;
751 751
752 GURL url = host->delegate()->GetURL(); 752 GURL url = host->delegate()->GetURL();
753 if (url.SchemeIs(chrome::kExtensionScheme)) { 753 if (url.SchemeIs(chrome::kExtensionScheme)) {
754 if (url.host() != extension->id()) 754 if (url.host() != extension->id())
755 continue; 755 continue;
756 } else if (!extension->web_extent().MatchesURL(url)) { 756 } else if (!extension->web_extent().MatchesURL(url)) {
757 continue; 757 continue;
758 } 758 }
759 759
760 result->push_back( 760 result->push_back(ExtensionPage(url, process->id(), host->routing_id(),
761 ExtensionPage(url, process->id(), host->routing_id(), 761 process->profile()->IsOffTheRecord()));
762 process->browser_context()->IsOffTheRecord()));
763 } 762 }
764 } 763 }
765 764
766 ExtensionsDOMHandler::~ExtensionsDOMHandler() { 765 ExtensionsDOMHandler::~ExtensionsDOMHandler() {
767 // There may be pending file dialogs, we need to tell them that we've gone 766 // There may be pending file dialogs, we need to tell them that we've gone
768 // away so they don't try and call back to us. 767 // away so they don't try and call back to us.
769 if (load_extension_dialog_.get()) 768 if (load_extension_dialog_.get())
770 load_extension_dialog_->ListenerDestroyed(); 769 load_extension_dialog_->ListenerDestroyed();
771 770
772 if (pack_job_.get()) 771 if (pack_job_.get())
(...skipping 22 matching lines...) Expand all
795 return ResourceBundle::GetSharedInstance(). 794 return ResourceBundle::GetSharedInstance().
796 LoadDataResourceBytes(IDR_PLUGIN); 795 LoadDataResourceBytes(IDR_PLUGIN);
797 } 796 }
798 797
799 // static 798 // static
800 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) { 799 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) {
801 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, 800 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode,
802 false, 801 false,
803 PrefService::SYNCABLE_PREF); 802 PrefService::SYNCABLE_PREF);
804 } 803 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/user_script_master.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698