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

Side by Side Diff: extensions/shell/browser/shell_extension_host_delegate.cc

Issue 2733283002: Require explicit selection of traits for LazyInstance (Closed)
Patch Set: l10n again Created 3 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/browser/shell_extension_host_delegate.h" 5 #include "extensions/shell/browser/shell_extension_host_delegate.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "extensions/browser/serial_extension_host_queue.h" 9 #include "extensions/browser/serial_extension_host_queue.h"
10 #include "extensions/shell/browser/media_capture_util.h" 10 #include "extensions/shell/browser/media_capture_util.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 bool ShellExtensionHostDelegate::CheckMediaAccessPermission( 57 bool ShellExtensionHostDelegate::CheckMediaAccessPermission(
58 content::WebContents* web_contents, 58 content::WebContents* web_contents,
59 const GURL& security_origin, 59 const GURL& security_origin,
60 content::MediaStreamType type, 60 content::MediaStreamType type,
61 const Extension* extension) { 61 const Extension* extension) {
62 media_capture_util::VerifyMediaAccessPermission(type, extension); 62 media_capture_util::VerifyMediaAccessPermission(type, extension);
63 return true; 63 return true;
64 } 64 }
65 65
66 static base::LazyInstance<SerialExtensionHostQueue> g_queue = 66 static base::LazyInstance<SerialExtensionHostQueue>::DestructorAtExit g_queue =
67 LAZY_INSTANCE_INITIALIZER; 67 LAZY_INSTANCE_INITIALIZER;
68 68
69 ExtensionHostQueue* ShellExtensionHostDelegate::GetExtensionHostQueue() const { 69 ExtensionHostQueue* ShellExtensionHostDelegate::GetExtensionHostQueue() const {
70 return g_queue.Pointer(); 70 return g_queue.Pointer();
71 } 71 }
72 72
73 } // namespace extensions 73 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/api/identity/identity_api.cc ('k') | extensions/shell/common/shell_extensions_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698