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

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

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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_INSTANT_OVERLAY_CONTROLLER_VIEWS_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_INSTANT_OVERLAY_CONTROLLER_VIEWS_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_INSTANT_OVERLAY_CONTROLLER_VIEWS_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_INSTANT_OVERLAY_CONTROLLER_VIEWS_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "chrome/browser/instant/instant_overlay_controller.h"	11 #include "chrome/browser/ui/search/instant_overlay_controller.h"

12	12

13 class Browser;	13 class Browser;

14 class ContentsContainer;	14 class ContentsContainer;

15	15

16 namespace views {	16 namespace views {

17 class WebView;	17 class WebView;

18 }	18 }

19	19

20 // A controller that manages the Views-specific Instant overlay. Its primary	20 // A controller that manages the Views-specific Instant overlay. Its primary

21 // role is to respond to display-state changes from the Instant model and	21 // role is to respond to display-state changes from the Instant model and

(...skipping 15 matching lines...) Expand all Loading...
37	37

38 ContentsContainer* const contents_;	38 ContentsContainer* const contents_;

39	39

40 // The view that contains the Instant overlay web contents.	40 // The view that contains the Instant overlay web contents.

41 scoped_ptr<views::WebView> overlay_;	41 scoped_ptr<views::WebView> overlay_;

42	42

43 DISALLOW_COPY_AND_ASSIGN(InstantOverlayControllerViews);	43 DISALLOW_COPY_AND_ASSIGN(InstantOverlayControllerViews);

44 };	44 };

45	45

46 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_INSTANT_OVERLAY_CONTROLLER_VIEWS_H_	46 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_INSTANT_OVERLAY_CONTROLLER_VIEWS_H_

OLD	NEW