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

Unified Diff: chrome/browser/instant/instant_overlay.cc

Issue 11824050: InstantExtended: Committed NTP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 7 years, 11 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/instant/instant_overlay.cc
diff --git a/chrome/browser/instant/instant_overlay.cc b/chrome/browser/instant/instant_overlay.cc
new file mode 100644
index 0000000000000000000000000000000000000000..865b847c10d85b95b66749584a47027eaf0f93fc
--- /dev/null
+++ b/chrome/browser/instant/instant_overlay.cc
@@ -0,0 +1,121 @@
+// 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/instant/instant_overlay.h"
+
+#include "base/supports_user_data.h"
+#include "chrome/browser/instant/instant_controller.h"
+#include "content/public/browser/web_contents.h"
+
+namespace {
+
+int kUserDataKey;
+
+class InstantOverlayUserData : public base::SupportsUserData::Data {
+ public:
+ explicit InstantOverlayUserData(InstantOverlay* overlay)
+ : overlay_(overlay) {}
+
+ InstantOverlay* overlay() const { return overlay_; }
+
+ private:
+ ~InstantOverlayUserData() {}
+
+ InstantOverlay* const overlay_;
+
+ DISALLOW_COPY_AND_ASSIGN(InstantOverlayUserData);
+};
+
+} // namespace
+
+// static
+InstantOverlay* InstantOverlay::FromWebContents(
+ const content::WebContents* web_contents) {
+ InstantOverlayUserData* data = static_cast<InstantOverlayUserData*>(
+ web_contents->GetUserData(&kUserDataKey));
+ return data ? data->overlay() : NULL;
+}
+
+InstantOverlay::InstantOverlay(InstantController* controller,
+ const std::string& instant_url)
+ : InstantPage(controller),
+ loader_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ instant_url_(instant_url),
+ is_stale_(false),
+ is_pointer_down_from_activate_(false) {
+}
+
+InstantOverlay::~InstantOverlay() {
+}
+
+void InstantOverlay::InitContents(Profile* profile,
+ const content::WebContents* active_tab) {
+ loader_.Load(GURL(instant_url_), profile, active_tab,
+ base::Bind(&InstantOverlay::HandleStalePage,
+ base::Unretained(this)));
+ SetContents(loader_.contents());
+ contents()->SetUserData(&kUserDataKey, new InstantOverlayUserData(this));
+}
+
+scoped_ptr<content::WebContents> InstantOverlay::ReleaseContents() {
+ contents()->RemoveUserData(&kUserDataKey);
+ SetContents(NULL);
+ return loader_.ReleaseContents();
+}
+
+void InstantOverlay::DidNavigate(
+ const history::HistoryAddPageArgs& add_page_args) {
+ last_navigation_ = add_page_args;
+}
+
+bool InstantOverlay::IsUsingLocalPreview() const {
+ return instant_url_ == InstantController::kLocalOmniboxPopupURL;
+}
+
+void InstantOverlay::Update(const string16& text,
+ size_t selection_start,
+ size_t selection_end,
+ bool verbatim) {
+ last_navigation_ = history::HistoryAddPageArgs();
+ InstantPage::Update(text, selection_start, selection_end, verbatim);
+}
+
+scoped_ptr<content::WebContents> InstantOverlay::SwapContents(
+ scoped_ptr<content::WebContents> new_contents) {
+ scoped_ptr<content::WebContents> old_contents = ReleaseContents();
+ loader_.SetContents(new_contents.Pass());
+ SetContents(loader_.contents());
+ contents()->SetUserData(&kUserDataKey, new InstantOverlayUserData(this));
+ instant_controller()->SwappedOverlayContents();
+ return old_contents.Pass();
+}
+
+void InstantOverlay::OnFocus() {
+ // The preview is getting focus. Equivalent to it being clicked.
+ bool tmp = is_pointer_down_from_activate_;
+ is_pointer_down_from_activate_ = true;
+ instant_controller()->FocusedOverlayContents();
+ is_pointer_down_from_activate_ = tmp;
+}
+
+bool InstantOverlay::OnOpenURL() {
+ // Navigation can continue if we are able to commit the overlay.
+ return instant_controller()->CommitIfPossible(INSTANT_COMMIT_NAVIGATED);
+}
+
+void InstantOverlay::OnMouseDown() {
+ is_pointer_down_from_activate_ = true;
+}
+
+void InstantOverlay::OnMouseUp() {
+ if (is_pointer_down_from_activate_) {
+ is_pointer_down_from_activate_ = false;
+ instant_controller()->CommitIfPossible(INSTANT_COMMIT_FOCUS_LOST);
+ }
+}
+
+void InstantOverlay::HandleStalePage() {
+ is_stale_ = true;
+ instant_controller()->ReloadOverlayIfStale();
+}

Powered by Google App Engine
This is Rietveld 408576698