Update to Chromium revision 194165.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1221 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-04-15 22:16:01 +00:00
parent 414befcd92
commit bb6eeee686
47 changed files with 154 additions and 121 deletions

View File

@@ -5,12 +5,12 @@
#include "libcef/browser/menu_creator.h"
#include "libcef/browser/browser_host_impl.h"
#include "libcef/browser/context_menu_params_impl.h"
#include "libcef/common/content_client.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/common/content_client.h"
#include "grit/cef_strings.h"
#if defined(OS_WIN)
@@ -24,7 +24,7 @@
namespace {
CefString GetLabel(int message_id) {
string16 label = content::GetContentClient()->GetLocalizedString(message_id);
string16 label = CefContentClient::Get()->GetLocalizedString(message_id);
DCHECK(!label.empty());
return label;
}