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

Unified Diff: chrome/browser/ui/ash/chrome_shell_content_state.h

Issue 2615663002: Fix MediaClient::RequestCaptureState(). (Closed)
Patch Set: rebase Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | chrome/browser/ui/ash/chrome_shell_content_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_shell_content_state.h
diff --git a/chrome/browser/ui/ash/chrome_shell_content_state.h b/chrome/browser/ui/ash/chrome_shell_content_state.h
index d3f3e80e4e95161020a07a377465825092ff331e..8bb026b51621d89e7f271e35d70c7155b18ead48 100644
--- a/chrome/browser/ui/ash/chrome_shell_content_state.h
+++ b/chrome/browser/ui/ash/chrome_shell_content_state.h
@@ -11,10 +11,10 @@
class ChromeShellContentState : public ash::ShellContentState {
public:
ChromeShellContentState();
-
- private:
~ChromeShellContentState() override;
+ static ChromeShellContentState* GetInstance();
+
// Overridden from ash::ShellContentState:
content::BrowserContext* GetActiveBrowserContext() override;
content::BrowserContext* GetBrowserContextByIndex(
@@ -24,6 +24,7 @@ class ChromeShellContentState : public ash::ShellContentState {
content::BrowserContext* GetUserPresentingBrowserContextForWindow(
aura::Window* window) override;
+ private:
DISALLOW_COPY_AND_ASSIGN(ChromeShellContentState);
};
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | chrome/browser/ui/ash/chrome_shell_content_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698