chrome/browser/ui/views/frame/instant_overlay_controller_views.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/views/frame/instant_overlay_controller_views.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:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/views/frame/instant_overlay_controller_views.h ('k') | chrome/browser/ui/webui/instant_ui.cc » ('j') | no next file with comments »

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/ui/views/frame/instant_overlay_controller_views.h"	5 #include "chrome/browser/ui/views/frame/instant_overlay_controller_views.h"

6	6

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

8 #include "chrome/browser/profiles/profile.h"	7 #include "chrome/browser/profiles/profile.h"

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

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

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

11 #include "chrome/browser/ui/views/frame/browser_view.h"	11 #include "chrome/browser/ui/views/frame/browser_view.h"

12 #include "chrome/browser/ui/views/frame/contents_container.h"	12 #include "chrome/browser/ui/views/frame/contents_container.h"

13 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"	13 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"

14 #include "ui/views/controls/webview/webview.h"	14 #include "ui/views/controls/webview/webview.h"

15	15

16 InstantOverlayControllerViews::InstantOverlayControllerViews(	16 InstantOverlayControllerViews::InstantOverlayControllerViews(

17 Browser* browser,	17 Browser* browser,

18 ContentsContainer* contents)	18 ContentsContainer* contents)

19 : InstantOverlayController(browser),	19 : InstantOverlayController(browser),

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 // view needs to stay on top.	52 // view needs to stay on top.

53 // Notify infobar container of change in overlay state.	53 // Notify infobar container of change in overlay state.

54 if (overlay_) {	54 if (overlay_) {

55 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);	55 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);

56 if (browser_view) {	56 if (browser_view) {

57 browser_view->MaybeStackImmersiveRevealAtTop();	57 browser_view->MaybeStackImmersiveRevealAtTop();

58 browser_view->infobar_container()->OverlayStateChanged(model);	58 browser_view->infobar_container()->OverlayStateChanged(model);

59 }	59 }

60 }	60 }

61 }	61 }

OLD	NEW