chrome/browser/ui/browser_instant_controller.cc - Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/

Side by Side Diff: chrome/browser/ui/browser_instant_controller.cc

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (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/browser.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('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 "base/prefs/pref_service.h"

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

9 #include "chrome/browser/extensions/extension_web_ui.h"	9 #include "chrome/browser/extensions/extension_web_ui.h"

	10 #include "chrome/browser/instant/search.h"

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

11 #include "chrome/browser/themes/theme_properties.h"	12 #include "chrome/browser/themes/theme_properties.h"

12 #include "chrome/browser/themes/theme_service.h"	13 #include "chrome/browser/themes/theme_service.h"

13 #include "chrome/browser/themes/theme_service_factory.h"	14 #include "chrome/browser/themes/theme_service_factory.h"

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

15 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/omnibox/location_bar.h"	17 #include "chrome/browser/ui/omnibox/location_bar.h"

17 #include "chrome/browser/ui/omnibox/omnibox_view.h"	18 #include "chrome/browser/ui/omnibox/omnibox_view.h"

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

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

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

21 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"	21 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"

22 #include "chrome/common/chrome_notification_types.h"	22 #include "chrome/common/chrome_notification_types.h"

23 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

24 #include "chrome/common/url_constants.h"	24 #include "chrome/common/url_constants.h"

25 #include "components/user_prefs/pref_registry_syncable.h"	25 #include "components/user_prefs/pref_registry_syncable.h"

26 #include "content/public/browser/notification_service.h"	26 #include "content/public/browser/notification_service.h"

27 #include "content/public/browser/user_metrics.h"	27 #include "content/public/browser/user_metrics.h"

28 #include "grit/theme_resources.h"	28 #include "grit/theme_resources.h"

(...skipping 298 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
327 initialized_theme_info_ = true;	327 initialized_theme_info_ = true;

328 }	328 }

329	329

330 DCHECK(initialized_theme_info_);	330 DCHECK(initialized_theme_info_);

331	331

332 if (browser_->search_model()->mode().is_ntp())	332 if (browser_->search_model()->mode().is_ntp())

333 instant_.ThemeChanged(theme_info_);	333 instant_.ThemeChanged(theme_info_);

334 }	334 }

335	335

336 } // namespace chrome	336 } // namespace chrome

OLD	NEW