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

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

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 content::BrowserContext* browser_context, 61 content::BrowserContext* browser_context,
62 const std::string& partition_id) override; 62 const std::string& partition_id) override;
63 virtual void GetStoragePartitionConfigForSite( 63 virtual void GetStoragePartitionConfigForSite(
64 content::BrowserContext* browser_context, 64 content::BrowserContext* browser_context,
65 const GURL& site, 65 const GURL& site,
66 bool can_be_default, 66 bool can_be_default,
67 std::string* partition_domain, 67 std::string* partition_domain,
68 std::string* partition_name, 68 std::string* partition_name,
69 bool* in_memory) override; 69 bool* in_memory) override;
70 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( 70 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
71 content::WebContents* web_contents) override; 71 content::WebContents* web_contents,
72 gfx::NativeView context) override;
72 virtual void RenderProcessWillLaunch( 73 virtual void RenderProcessWillLaunch(
73 content::RenderProcessHost* host) override; 74 content::RenderProcessHost* host) override;
74 virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context, 75 virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context,
75 const GURL& effective_url) override; 76 const GURL& effective_url) override;
76 virtual GURL GetEffectiveURL(content::BrowserContext* browser_context, 77 virtual GURL GetEffectiveURL(content::BrowserContext* browser_context,
77 const GURL& url) override; 78 const GURL& url) override;
78 virtual void GetAdditionalWebUISchemes( 79 virtual void GetAdditionalWebUISchemes(
79 std::vector<std::string>* additional_schemes) override; 80 std::vector<std::string>* additional_schemes) override;
80 virtual void GetAdditionalWebUIHostsToIgnoreParititionCheck( 81 virtual void GetAdditionalWebUIHostsToIgnoreParititionCheck(
81 std::vector<std::string>* hosts) override; 82 std::vector<std::string>* hosts) override;
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 355 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
355 356
356 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 357 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
357 358
358 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 359 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
359 }; 360 };
360 361
361 } // namespace chrome 362 } // namespace chrome
362 363
363 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 364 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698