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

Side by Side Diff: chrome/browser/ui/search/instant_tab.cc

Issue 2144733004: Merge InstantPage into InstantTab. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. Created 4 years, 5 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 2012 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/ui/search/instant_tab.h" 5 #include "chrome/browser/ui/search/instant_tab.h"
6 6
7 #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h" 7 #include "chrome/browser/ui/search/search_model.h"
8 #include "chrome/browser/ui/search/search_tab_helper.h"
9 #include "chrome/common/url_constants.h"
10 #include "content/public/browser/render_frame_host.h"
8 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
9 12
10 InstantTab::InstantTab(InstantPage::Delegate* delegate) 13 InstantTab::Delegate::~Delegate() {
11 : InstantPage(delegate) {
12 } 14 }
13 15
14 InstantTab::~InstantTab() { 16 InstantTab::~InstantTab() {
17 if (web_contents()) {
18 SearchTabHelper::FromWebContents(web_contents())->model()->RemoveObserver(
19 this);
20 }
15 } 21 }
16 22
17 void InstantTab::Init(content::WebContents* contents) { 23 bool InstantTab::supports_instant() const {
18 SetContents(contents); 24 return web_contents() &&
25 SearchTabHelper::FromWebContents(web_contents())->SupportsInstant();
19 } 26 }
20 27
21 bool InstantTab::ShouldProcessAboutToNavigateMainFrame() { 28 bool InstantTab::IsLocal() const {
22 return true; 29 return web_contents() &&
30 web_contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl);
23 } 31 }
32
33 InstantTab::InstantTab(Delegate* delegate)
34 : delegate_(delegate) {
35 }
36
37 void InstantTab::Init(content::WebContents* new_web_contents) {
38 ClearContents();
39
40 if (!new_web_contents)
41 return;
42
43 Observe(new_web_contents);
44 SearchModel* model =
45 SearchTabHelper::FromWebContents(web_contents())->model();
46 model->AddObserver(this);
47
48 // Already know whether the page supports instant.
49 if (model->instant_support() != INSTANT_SUPPORT_UNKNOWN)
50 InstantSupportDetermined(model->instant_support() == INSTANT_SUPPORT_YES);
51 }
52
53 void InstantTab::DidCommitProvisionalLoadForFrame(
54 content::RenderFrameHost* render_frame_host,
55 const GURL& url,
56 ui::PageTransition /* transition_type */) {
57 if (!render_frame_host->GetParent()) {
58 delegate_->InstantTabAboutToNavigateMainFrame(web_contents(), url);
59 }
60 }
61
62 void InstantTab::ModelChanged(const SearchModel::State& old_state,
63 const SearchModel::State& new_state) {
64 if (old_state.instant_support != new_state.instant_support)
65 InstantSupportDetermined(new_state.instant_support == INSTANT_SUPPORT_YES);
66 }
67
68 void InstantTab::InstantSupportDetermined(bool supports_instant) {
69 delegate_->InstantSupportDetermined(web_contents(), supports_instant);
70
71 // If the page doesn't support Instant, stop listening to it.
72 if (!supports_instant)
73 ClearContents();
74 }
75
76 void InstantTab::ClearContents() {
77 if (web_contents()) {
78 SearchTabHelper::FromWebContents(web_contents())->model()->RemoveObserver(
79 this);
80 }
81
82 Observe(NULL);
83 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_tab.h ('k') | chrome/browser/ui/search/instant_tab_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698