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

Side by Side Diff: content/browser/plugin_service_impl.cc

Issue 1111913002: vs2015: avoid narrowing warning in plugin_service_impl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2015-v8
Patch Set: Created 5 years, 7 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 | « no previous file | no next file » | 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 #include "content/browser/plugin_service_impl.h" 5 #include "content/browser/plugin_service_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 #if defined(OS_MACOSX) 831 #if defined(OS_MACOSX)
832 void PluginServiceImpl::AppActivated() { 832 void PluginServiceImpl::AppActivated() {
833 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, 833 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
834 base::Bind(&NotifyPluginsOfActivation)); 834 base::Bind(&NotifyPluginsOfActivation));
835 } 835 }
836 #elif defined(OS_WIN) 836 #elif defined(OS_WIN)
837 837
838 bool GetPluginPropertyFromWindow( 838 bool GetPluginPropertyFromWindow(
839 HWND window, const wchar_t* plugin_atom_property, 839 HWND window, const wchar_t* plugin_atom_property,
840 base::string16* plugin_property) { 840 base::string16* plugin_property) {
841 ATOM plugin_atom = reinterpret_cast<ATOM>( 841 ATOM plugin_atom = static_cast<ATOM>(
842 GetPropW(window, plugin_atom_property)); 842 reinterpret_cast<uintptr_t>(GetPropW(window, plugin_atom_property)));
843 if (plugin_atom != 0) { 843 if (plugin_atom != 0) {
844 WCHAR plugin_property_local[MAX_PATH] = {0}; 844 WCHAR plugin_property_local[MAX_PATH] = {0};
845 GlobalGetAtomNameW(plugin_atom, 845 GlobalGetAtomNameW(plugin_atom,
846 plugin_property_local, 846 plugin_property_local,
847 ARRAYSIZE(plugin_property_local)); 847 ARRAYSIZE(plugin_property_local));
848 *plugin_property = plugin_property_local; 848 *plugin_property = plugin_property_local;
849 return true; 849 return true;
850 } 850 }
851 return false; 851 return false;
852 } 852 }
(...skipping 23 matching lines...) Expand all
876 #endif 876 #endif
877 877
878 bool PluginServiceImpl::PpapiDevChannelSupported( 878 bool PluginServiceImpl::PpapiDevChannelSupported(
879 BrowserContext* browser_context, 879 BrowserContext* browser_context,
880 const GURL& document_url) { 880 const GURL& document_url) {
881 return content::GetContentClient()->browser()-> 881 return content::GetContentClient()->browser()->
882 IsPluginAllowedToUseDevChannelAPIs(browser_context, document_url); 882 IsPluginAllowedToUseDevChannelAPIs(browser_context, document_url);
883 } 883 }
884 884
885 } // namespace content 885 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698