OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/rlz/chrome_rlz_tracker_delegate.h" | 5 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "build/build_config.h" |
10 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/google/google_brand.h" | 13 #include "chrome/browser/google/google_brand.h" |
13 #include "chrome/browser/prefs/session_startup_pref.h" | 14 #include "chrome/browser/prefs/session_startup_pref.h" |
14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/search_engines/template_url_service_factory.h" | 16 #include "chrome/browser/search_engines/template_url_service_factory.h" |
16 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 17 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
17 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
19 #include "components/google/core/browser/google_util.h" | 20 #include "components/google/core/browser/google_util.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 // to remain as unaffected as possible by this change. This test is | 224 // to remain as unaffected as possible by this change. This test is |
224 // there to keep the old behavior. | 225 // there to keep the old behavior. |
225 if (!log->is_popup_open) | 226 if (!log->is_popup_open) |
226 return; | 227 return; |
227 | 228 |
228 omnibox_url_opened_subscription_.reset(); | 229 omnibox_url_opened_subscription_.reset(); |
229 base::Closure omnibox_callback; | 230 base::Closure omnibox_callback; |
230 swap(omnibox_callback, on_omnibox_search_callback_); | 231 swap(omnibox_callback, on_omnibox_search_callback_); |
231 omnibox_callback.Run(); | 232 omnibox_callback.Run(); |
232 } | 233 } |
OLD | NEW |