chrome/browser/renderer_host/pepper/pepper_talk_host.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/renderer_host/pepper/pepper_talk_host.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/renderer_context_menu/spelling_menu_observer.cc ('k') | chrome/browser/repost_form_warning_controller.cc » ('j') | no next file with comments »

OLD	NEW
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 "chrome/browser/renderer_host/pepper/pepper_talk_host.h"	5 #include "chrome/browser/renderer_host/pepper/pepper_talk_host.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

	8 #include "chrome/grit/generated_resources.h"

8 #include "content/public/browser/browser_ppapi_host.h"	9 #include "content/public/browser/browser_ppapi_host.h"

9 #include "content/public/browser/browser_thread.h"	10 #include "content/public/browser/browser_thread.h"

10 #include "content/public/browser/render_frame_host.h"	11 #include "content/public/browser/render_frame_host.h"

11 #include "grit/generated_resources.h"

12 #include "ppapi/c/pp_errors.h"	12 #include "ppapi/c/pp_errors.h"

13 #include "ppapi/host/dispatch_host_message.h"	13 #include "ppapi/host/dispatch_host_message.h"

14 #include "ppapi/host/host_message_context.h"	14 #include "ppapi/host/host_message_context.h"

15 #include "ppapi/host/ppapi_host.h"	15 #include "ppapi/host/ppapi_host.h"

16 #include "ppapi/proxy/ppapi_messages.h"	16 #include "ppapi/proxy/ppapi_messages.h"

17 #include "ui/base/l10n/l10n_util.h"	17 #include "ui/base/l10n/l10n_util.h"

18	18

19 #if defined(USE_ASH)	19 #if defined(USE_ASH)

20 #include "ash/shell.h"	20 #include "ash/shell.h"

21 #include "ash/shell_window_ids.h"	21 #include "ash/shell_window_ids.h"

(...skipping 226 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
248 }	248 }

249	249

250 void PepperTalkHost::OnStopRemotingCompleted(	250 void PepperTalkHost::OnStopRemotingCompleted(

251 ppapi::host::ReplyMessageContext reply) {	251 ppapi::host::ReplyMessageContext reply) {

252 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));	252 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));

253 remoting_started_ = false;	253 remoting_started_ = false;

254 host()->SendReply(reply, PpapiPluginMsg_Talk_StopRemotingReply());	254 host()->SendReply(reply, PpapiPluginMsg_Talk_StopRemotingReply());

255 }	255 }

256	256

257 } // namespace chrome	257 } // namespace chrome

OLD	NEW