chrome/browser/ui/search/instant_overlay_controller.cc - Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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:

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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/instant/instant_overlay_controller.h"	5 #include "chrome/browser/ui/search/instant_overlay_controller.h"

6	6

7 #include "chrome/browser/ui/browser.h"	7 #include "chrome/browser/ui/browser.h"

8 #include "chrome/browser/ui/browser_instant_controller.h"	8 #include "chrome/browser/ui/browser_instant_controller.h"

9	9

10 InstantOverlayController::InstantOverlayController(Browser* browser)	10 InstantOverlayController::InstantOverlayController(Browser* browser)

11 : browser_(browser) {	11 : browser_(browser) {

12 if (browser_->instant_controller())	12 if (browser_->instant_controller())

13 browser_->instant_controller()->instant()->model()->AddObserver(this);	13 browser_->instant_controller()->instant()->model()->AddObserver(this);

14 }	14 }

15	15

16 InstantOverlayController::~InstantOverlayController() {	16 InstantOverlayController::~InstantOverlayController() {

17 if (browser_->instant_controller())	17 if (browser_->instant_controller())

18 browser_->instant_controller()->instant()->model()->RemoveObserver(this);	18 browser_->instant_controller()->instant()->model()->RemoveObserver(this);

19 }	19 }

OLD	NEW