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

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

Issue 11783038: Allow multiple WebUIControllerFactory objects to be registered. This makes is possible to implement… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: reland after bogus revert of r175971 Created 7 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 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext()); 724 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
725 if (!profile) 725 if (!profile)
726 return; 726 return;
727 727
728 InstantService* instant_service = 728 InstantService* instant_service =
729 InstantServiceFactory::GetForProfile(profile); 729 InstantServiceFactory::GetForProfile(profile);
730 if (instant_service) 730 if (instant_service)
731 instant_service->RemoveInstantProcess(host->GetID()); 731 instant_service->RemoveInstantProcess(host->GetID());
732 } 732 }
733 733
734 content::WebUIControllerFactory*
735 ChromeContentBrowserClient::GetWebUIControllerFactory() {
736 return ChromeWebUIControllerFactory::GetInstance();
737 }
738
739 GURL ChromeContentBrowserClient::GetEffectiveURL( 734 GURL ChromeContentBrowserClient::GetEffectiveURL(
740 content::BrowserContext* browser_context, const GURL& url) { 735 content::BrowserContext* browser_context, const GURL& url) {
741 Profile* profile = Profile::FromBrowserContext(browser_context); 736 Profile* profile = Profile::FromBrowserContext(browser_context);
742 if (!profile) 737 if (!profile)
743 return url; 738 return url;
744 739
745 // If the input |url| is an Instant url, make its effective url distinct from 740 // If the input |url| is an Instant url, make its effective url distinct from
746 // other urls on the search provider's domain. 741 // other urls on the search provider's domain.
747 if (IsInstantURL(url, profile)) 742 if (IsInstantURL(url, profile))
748 return GetEffectiveInstantURL(url, profile); 743 return GetEffectiveInstantURL(url, profile);
(...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after
2055 io_thread_application_locale_ = locale; 2050 io_thread_application_locale_ = locale;
2056 } 2051 }
2057 2052
2058 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2053 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2059 const std::string& locale) { 2054 const std::string& locale) {
2060 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2055 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2061 io_thread_application_locale_ = locale; 2056 io_thread_application_locale_ = locale;
2062 } 2057 }
2063 2058
2064 } // namespace chrome 2059 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/devtools/devtools_file_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698