chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm - Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search.

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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h ('k') | chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm

diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm

index 059b05d14a47acbdbf8b6885e55bb4daee8304b4..13bad50e89dc6abbbe84705b758654737cc3c42c 100644

--- a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm

+++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm

@@ -2,11 +2,11 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h"

-#include "chrome/browser/instant/instant_overlay_model.h"

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

#import "chrome/browser/ui/cocoa/browser_window_controller.h"

+#include "chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h"

#import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"

+#include "chrome/browser/ui/search/instant_overlay_model.h"

InstantOverlayControllerMac::InstantOverlayControllerMac(

Browser* browser,