chrome/browser/infobars/infobar_container.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/infobars/infobar_container.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

« no previous file with comments | « chrome/browser/history/history_tab_helper.cc ('k') | chrome/browser/infobars/infobar_container.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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_INFOBARS_INFOBAR_CONTAINER_H_	5 #ifndef CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_H_

6 #define CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_H_	6 #define CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

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

11 #include "base/time.h"	11 #include "base/time.h"

12 #include "chrome/browser/instant/instant_overlay_model_observer.h"	12 #include "chrome/browser/ui/search/instant_overlay_model_observer.h"

13 #include "chrome/browser/ui/search/search_model_observer.h"	13 #include "chrome/browser/ui/search/search_model_observer.h"

14 #include "chrome/common/search_types.h"	14 #include "chrome/common/search_types.h"

15 #include "content/public/browser/notification_observer.h"	15 #include "content/public/browser/notification_observer.h"

16 #include "content/public/browser/notification_registrar.h"	16 #include "content/public/browser/notification_registrar.h"

17 #include "third_party/skia/include/core/SkColor.h"	17 #include "third_party/skia/include/core/SkColor.h"

18	18

19 class InfoBar;	19 class InfoBar;

20 class InfoBarDelegate;	20 class InfoBarDelegate;

21 class InfoBarService;	21 class InfoBarService;

22	22

(...skipping 157 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
180 // Extended.	180 // Extended.

181 chrome::search::SearchModel* search_model_;	181 chrome::search::SearchModel* search_model_;

182	182

183 // Calculated in SetMaxTopArrowHeight().	183 // Calculated in SetMaxTopArrowHeight().

184 int top_arrow_target_height_;	184 int top_arrow_target_height_;

185	185

186 DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);	186 DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);

187 };	187 };

188	188

189 #endif // CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_H_	189 #endif // CHROME_BROWSER_INFOBARS_INFOBAR_CONTAINER_H_

OLD	NEW