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/prefs/pref_registry_syncable.h" | |
10 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/browser/themes/theme_properties.h" | 10 #include "chrome/browser/themes/theme_properties.h" |
12 #include "chrome/browser/themes/theme_service.h" | 11 #include "chrome/browser/themes/theme_service.h" |
13 #include "chrome/browser/themes/theme_service_factory.h" | 12 #include "chrome/browser/themes/theme_service_factory.h" |
14 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 13 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
15 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/browser_window.h" | 15 #include "chrome/browser/ui/browser_window.h" |
17 #include "chrome/browser/ui/omnibox/location_bar.h" | 16 #include "chrome/browser/ui/omnibox/location_bar.h" |
18 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 17 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
19 #include "chrome/browser/ui/search/search.h" | 18 #include "chrome/browser/ui/search/search.h" |
20 #include "chrome/browser/ui/search/search_tab_helper.h" | 19 #include "chrome/browser/ui/search/search_tab_helper.h" |
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
22 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" | 21 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" |
23 #include "chrome/common/chrome_notification_types.h" | 22 #include "chrome/common/chrome_notification_types.h" |
24 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
25 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.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 "grit/theme_resources.h" | 27 #include "grit/theme_resources.h" |
28 #include "ui/gfx/color_utils.h" | 28 #include "ui/gfx/color_utils.h" |
29 #include "ui/gfx/sys_color_change_listener.h" | 29 #include "ui/gfx/sys_color_change_listener.h" |
30 | 30 |
31 namespace { | 31 namespace { |
32 const char* GetInstantPrefName(Profile* profile) { | 32 const char* GetInstantPrefName(Profile* profile) { |
33 return chrome::search::IsInstantExtendedAPIEnabled(profile) ? | 33 return chrome::search::IsInstantExtendedAPIEnabled(profile) ? |
34 prefs::kInstantExtendedEnabled : prefs::kInstantEnabled; | 34 prefs::kInstantExtendedEnabled : prefs::kInstantEnabled; |
35 } | 35 } |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 initialized_theme_info_ = true; | 341 initialized_theme_info_ = true; |
342 } | 342 } |
343 | 343 |
344 DCHECK(initialized_theme_info_); | 344 DCHECK(initialized_theme_info_); |
345 | 345 |
346 if (browser_->search_model()->mode().is_ntp()) | 346 if (browser_->search_model()->mode().is_ntp()) |
347 instant_.ThemeChanged(theme_info_); | 347 instant_.ThemeChanged(theme_info_); |
348 } | 348 } |
349 | 349 |
350 } // namespace chrome | 350 } // namespace chrome |
OLD | NEW |