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

Unified Diff: chrome/browser/guestview/adview/adview_guest.cc

Issue 259943002: Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: static intializer fix Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/guestview/adview/adview_guest.cc
diff --git a/chrome/browser/guestview/adview/adview_guest.cc b/chrome/browser/guestview/adview/adview_guest.cc
deleted file mode 100644
index 6b0de6fbca74d5e556d2d2ccca5982b2566817c3..0000000000000000000000000000000000000000
--- a/chrome/browser/guestview/adview/adview_guest.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/guestview/adview/adview_guest.h"
-
-#include "base/strings/string_util.h"
-#include "chrome/browser/guestview/adview/adview_constants.h"
-#include "chrome/browser/guestview/guestview_constants.h"
-#include "content/public/browser/web_contents.h"
-#include "net/base/net_errors.h"
-
-using content::WebContents;
-
-AdViewGuest::AdViewGuest(WebContents* guest_web_contents,
- const std::string& extension_id)
- : GuestView(guest_web_contents, extension_id),
- WebContentsObserver(guest_web_contents) {
-}
-
-// static
-AdViewGuest* AdViewGuest::From(int embedder_process_id,
- int guest_instance_id) {
- GuestView* guest = GuestView::From(embedder_process_id, guest_instance_id);
- if (!guest)
- return NULL;
- return guest->AsAdView();
-}
-
-GuestView::Type AdViewGuest::GetViewType() const {
- return GuestView::ADVIEW;
-}
-
-WebViewGuest* AdViewGuest::AsWebView() {
- return NULL;
-}
-
-AdViewGuest* AdViewGuest::AsAdView() {
- return this;
-}
-
-AdViewGuest::~AdViewGuest() {
-}
-
-void AdViewGuest::DidCommitProvisionalLoadForFrame(
- int64 frame_id,
- const base::string16& frame_unique_name,
- bool is_main_frame,
- const GURL& url,
- content::PageTransition transition_type,
- content::RenderViewHost* render_view_host) {
- scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
- args->SetString(guestview::kUrl, url.spec());
- args->SetBoolean(guestview::kIsTopLevel, is_main_frame);
- DispatchEvent(new GuestView::Event(adview::kEventLoadCommit, args.Pass()));
-}
-
-void AdViewGuest::DidFailProvisionalLoad(
- int64 frame_id,
- const base::string16& frame_unique_name,
- bool is_main_frame,
- const GURL& validated_url,
- int error_code,
- const base::string16& error_description,
- content::RenderViewHost* render_view_host) {
- // Translate the |error_code| into an error string.
- std::string error_type;
- base::RemoveChars(net::ErrorToString(error_code), "net::", &error_type);
-
- scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
- args->SetBoolean(guestview::kIsTopLevel, is_main_frame);
- args->SetString(guestview::kUrl, validated_url.spec());
- args->SetString(guestview::kReason, error_type);
- DispatchEvent(new GuestView::Event(adview::kEventLoadAbort, args.Pass()));
-}

Powered by Google App Engine
This is Rietveld 408576698