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

Side by Side Diff: chrome/browser/guestview/adview/adview_guest.cc

Issue 237533008: Refactor GuestView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
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"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 12
13 using content::WebContents; 13 using content::WebContents;
14 14
15 AdViewGuest::AdViewGuest(WebContents* guest_web_contents, 15 AdViewGuest::AdViewGuest(WebContents* guest_web_contents,
16 const std::string& extension_id) 16 const std::string& extension_id)
17 : GuestView(guest_web_contents, extension_id), 17 : GuestView(guest_web_contents, extension_id),
18 WebContentsObserver(guest_web_contents) { 18 WebContentsObserver(guest_web_contents) {
19 } 19 }
20 20
21 // static 21 // static
22 AdViewGuest* AdViewGuest::From(int embedder_process_id, 22 AdViewGuest* AdViewGuest::From(int embedder_process_id,
23 int guest_instance_id) { 23 int guest_instance_id) {
24 GuestView* guest = GuestView::From(embedder_process_id, guest_instance_id); 24 GuestView* guest = GuestView::From(embedder_process_id, guest_instance_id);
25 if (!guest) 25 if (!guest)
26 return NULL; 26 return NULL;
27 return guest->AsAdView(); 27 return guest->As<AdViewGuest>();
28 } 28 }
29 29
30 GuestView::Type AdViewGuest::GetViewType() const { 30 // static
31 return GuestView::ADVIEW; 31 GuestView::Type AdViewGuest::Type() { return GuestView::ADVIEW; }
32 }
33 32
34 WebViewGuest* AdViewGuest::AsWebView() { 33 GuestView::Type AdViewGuest::GetViewType() const { return Type(); }
35 return NULL;
36 }
37
38 AdViewGuest* AdViewGuest::AsAdView() {
39 return this;
40 }
41 34
42 AdViewGuest::~AdViewGuest() { 35 AdViewGuest::~AdViewGuest() {
43 } 36 }
44 37
45 void AdViewGuest::DidCommitProvisionalLoadForFrame( 38 void AdViewGuest::DidCommitProvisionalLoadForFrame(
46 int64 frame_id, 39 int64 frame_id,
47 const base::string16& frame_unique_name, 40 const base::string16& frame_unique_name,
48 bool is_main_frame, 41 bool is_main_frame,
49 const GURL& url, 42 const GURL& url,
50 content::PageTransition transition_type, 43 content::PageTransition transition_type,
(...skipping 15 matching lines...) Expand all
66 // Translate the |error_code| into an error string. 59 // Translate the |error_code| into an error string.
67 std::string error_type; 60 std::string error_type;
68 base::RemoveChars(net::ErrorToString(error_code), "net::", &error_type); 61 base::RemoveChars(net::ErrorToString(error_code), "net::", &error_type);
69 62
70 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); 63 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
71 args->SetBoolean(guestview::kIsTopLevel, is_main_frame); 64 args->SetBoolean(guestview::kIsTopLevel, is_main_frame);
72 args->SetString(guestview::kUrl, validated_url.spec()); 65 args->SetString(guestview::kUrl, validated_url.spec());
73 args->SetString(guestview::kReason, error_type); 66 args->SetString(guestview::kReason, error_type);
74 DispatchEvent(new GuestView::Event(adview::kEventLoadAbort, args.Pass())); 67 DispatchEvent(new GuestView::Event(adview::kEventLoadAbort, args.Pass()));
75 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698