chrome/browser/ui/browser_instant_controller.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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/browser_instant_controller.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | chrome/browser/ui/browser_list_impl.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/browser_instant_controller.h"	5 #include "chrome/browser/ui/browser_instant_controller.h"

6	6

	7 #include "base/prefs/pref_service.h"

7 #include "chrome/browser/extensions/extension_service.h"	8 #include "chrome/browser/extensions/extension_service.h"

8 #include "chrome/browser/prefs/pref_registry_syncable.h"	9 #include "chrome/browser/prefs/pref_registry_syncable.h"

9 #include "chrome/browser/prefs/pref_service.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/themes/theme_service.h"	11 #include "chrome/browser/themes/theme_service.h"

12 #include "chrome/browser/themes/theme_service_factory.h"	12 #include "chrome/browser/themes/theme_service_factory.h"

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

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

15 #include "chrome/browser/ui/omnibox/location_bar.h"	15 #include "chrome/browser/ui/omnibox/location_bar.h"

16 #include "chrome/browser/ui/omnibox/omnibox_view.h"	16 #include "chrome/browser/ui/omnibox/omnibox_view.h"

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

18 #include "chrome/browser/ui/search/search_tab_helper.h"	18 #include "chrome/browser/ui/search/search_tab_helper.h"

19 #include "chrome/browser/ui/tabs/tab_strip_model.h"	19 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 344 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
364 // part of the image overlay should draw, 'cos the origin is top-left.	364 // part of the image overlay should draw, 'cos the origin is top-left.

365 if (!browser_->search_model()->mode().is_ntp() \|\|	365 if (!browser_->search_model()->mode().is_ntp() \|\|

366 theme_info_.theme_id.empty() \|\|	366 theme_info_.theme_id.empty() \|\|

367 theme_info_.image_vertical_alignment == THEME_BKGRND_IMAGE_ALIGN_TOP) {	367 theme_info_.image_vertical_alignment == THEME_BKGRND_IMAGE_ALIGN_TOP) {

368 return;	368 return;

369 }	369 }

370 instant_.ThemeAreaHeightChanged(theme_area_height_);	370 instant_.ThemeAreaHeightChanged(theme_area_height_);

371 }	371 }

372	372

373 } // namespace chrome	373 } // namespace chrome

OLD	NEW