trunk/src/chrome/browser/guestview/adview/adview_guest.cc - Issue 252773003: Revert 266297 "1. Handle the case of empty embedder_extension_id..."

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: trunk/src/chrome/browser/guestview/adview/adview_guest.cc

Issue 252773003: Revert 266297 "1. Handle the case of empty embedder_extension_id..." (Closed) Base URL: svn://svn.chromium.org/chrome/

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

« no previous file with comments | « trunk/src/chrome/browser/guestview/adview/adview_guest.h ('k') | trunk/src/chrome/browser/guestview/guestview.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/guestview/adview/adview_guest.h"	5 #include "chrome/browser/guestview/adview/adview_guest.h"

6	6

7 #include "base/strings/string_util.h"	7 #include "base/strings/string_util.h"

8 #include "chrome/browser/guestview/adview/adview_constants.h"	8 #include "chrome/browser/guestview/adview/adview_constants.h"

9 #include "chrome/browser/guestview/guestview_constants.h"	9 #include "chrome/browser/guestview/guestview_constants.h"

10 #include "content/public/browser/web_contents.h"	10 #include "content/public/browser/web_contents.h"

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 // Translate the \|error_code\| into an error string.	66 // Translate the \|error_code\| into an error string.

67 std::string error_type;	67 std::string error_type;

68 base::RemoveChars(net::ErrorToString(error_code), "net::", &error_type);	68 base::RemoveChars(net::ErrorToString(error_code), "net::", &error_type);

69	69

70 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());	70 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());

71 args->SetBoolean(guestview::kIsTopLevel, is_main_frame);	71 args->SetBoolean(guestview::kIsTopLevel, is_main_frame);

72 args->SetString(guestview::kUrl, validated_url.spec());	72 args->SetString(guestview::kUrl, validated_url.spec());

73 args->SetString(guestview::kReason, error_type);	73 args->SetString(guestview::kReason, error_type);

74 DispatchEvent(new GuestView::Event(adview::kEventLoadAbort, args.Pass()));	74 DispatchEvent(new GuestView::Event(adview::kEventLoadAbort, args.Pass()));

75 }	75 }

OLD	NEW