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

Unified Diff: chrome/browser/ui/browser_instant_controller.h

Issue 137993020: (Try 2) InstantExtended: remove dead code related to the non-cacheable NTP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable InstantPolicyTests Created 6 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/ui/browser_instant_controller.h
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h
index 06450fdfe7330689ec29c79951249e7ca974fa67..6af5d03725794545bbf0f65409541ef75e6c8f96 100644
--- a/chrome/browser/ui/browser_instant_controller.h
+++ b/chrome/browser/ui/browser_instant_controller.h
@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "chrome/browser/search/instant_service_observer.h"
#include "chrome/browser/ui/search/instant_controller.h"
-#include "chrome/browser/ui/search/instant_unload_handler.h"
#include "chrome/browser/ui/search/search_model_observer.h"
class Browser;
@@ -32,18 +31,6 @@ class BrowserInstantController : public SearchModelObserver,
explicit BrowserInstantController(Browser* browser);
virtual ~BrowserInstantController();
- // If |url| is the new tab page URL, set |target_contents| to the preloaded
- // NTP contents from InstantController. If |source_contents| is not NULL, we
- // replace it with the new |target_contents| in the tabstrip and delete
- // |source_contents|. Otherwise, the caller owns |target_contents| and is
- // responsible for inserting it into the tabstrip.
- //
- // Returns true if and only if we update |target_contents|.
- bool MaybeSwapInInstantNTPContents(
- const GURL& url,
- content::WebContents* source_contents,
- content::WebContents** target_contents);
-
// Commits the current Instant, returning true on success. This is intended
// for use from OpenCurrentURL.
bool OpenInstant(WindowOpenDisposition disposition, const GURL& url);
@@ -88,7 +75,6 @@ class BrowserInstantController : public SearchModelObserver,
Browser* const browser_;
InstantController instant_;
- InstantUnloadHandler instant_unload_handler_;
DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
};
« no previous file with comments | « chrome/browser/task_manager/task_manager_util_unittest.cc ('k') | chrome/browser/ui/browser_instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698