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

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

Issue 10690048: Clean up RenderViewHostManager swapping logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict Created 8 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 const GURL& url) OVERRIDE; 70 const GURL& url) OVERRIDE;
71 virtual bool IsHandledURL(const GURL& url) OVERRIDE; 71 virtual bool IsHandledURL(const GURL& url) OVERRIDE;
72 virtual bool IsSuitableHost(content::RenderProcessHost* process_host, 72 virtual bool IsSuitableHost(content::RenderProcessHost* process_host,
73 const GURL& url) OVERRIDE; 73 const GURL& url) OVERRIDE;
74 virtual bool ShouldTryToUseExistingProcessHost( 74 virtual bool ShouldTryToUseExistingProcessHost(
75 content::BrowserContext* browser_context, const GURL& url) OVERRIDE; 75 content::BrowserContext* browser_context, const GURL& url) OVERRIDE;
76 virtual void SiteInstanceGotProcess( 76 virtual void SiteInstanceGotProcess(
77 content::SiteInstance* site_instance) OVERRIDE; 77 content::SiteInstance* site_instance) OVERRIDE;
78 virtual void SiteInstanceDeleting(content::SiteInstance* site_instance) 78 virtual void SiteInstanceDeleting(content::SiteInstance* site_instance)
79 OVERRIDE; 79 OVERRIDE;
80 virtual bool ShouldSwapProcessesForNavigation(const GURL& current_url, 80 virtual bool ShouldSwapBrowsingInstanceForNavigation(
81 const GURL& new_url) OVERRIDE; 81 content::BrowserContext* browser_context,
82 const GURL& current_url,
83 const GURL& new_url) OVERRIDE;
82 virtual bool ShouldSwapProcessesForRedirect( 84 virtual bool ShouldSwapProcessesForRedirect(
83 content::ResourceContext* resource_context, 85 content::ResourceContext* resource_context,
84 const GURL& current_url, 86 const GURL& current_url,
85 const GURL& new_url) OVERRIDE; 87 const GURL& new_url) OVERRIDE;
86 virtual std::string GetCanonicalEncodingNameByAliasName( 88 virtual std::string GetCanonicalEncodingNameByAliasName(
87 const std::string& alias_name) OVERRIDE; 89 const std::string& alias_name) OVERRIDE;
88 virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, 90 virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
89 int child_process_id) OVERRIDE; 91 int child_process_id) OVERRIDE;
90 virtual std::string GetApplicationLocale() OVERRIDE; 92 virtual std::string GetApplicationLocale() OVERRIDE;
91 virtual std::string GetAcceptLangs( 93 virtual std::string GetAcceptLangs(
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // Cached version of the locale so we can return the locale on the I/O 254 // Cached version of the locale so we can return the locale on the I/O
253 // thread. 255 // thread.
254 std::string io_thread_application_locale_; 256 std::string io_thread_application_locale_;
255 257
256 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 258 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
257 }; 259 };
258 260
259 } // namespace chrome 261 } // namespace chrome
260 262
261 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 263 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698