Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: chrome/browser/rlz/chrome_rlz_tracker_delegate.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
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"
10 #include "build/build_config.h" 9 #include "build/build_config.h"
11 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/google/google_brand.h" 12 #include "chrome/browser/google/google_brand.h"
14 #include "chrome/browser/prefs/session_startup_pref.h" 13 #include "chrome/browser/prefs/session_startup_pref.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/search_engines/template_url_service_factory.h" 15 #include "chrome/browser/search_engines/template_url_service_factory.h"
17 #include "chrome/browser/ui/startup/startup_browser_creator.h" 16 #include "chrome/browser/ui/startup/startup_browser_creator.h"
18 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
20 #include "components/google/core/browser/google_util.h" 19 #include "components/google/core/browser/google_util.h"
21 #include "components/omnibox/browser/omnibox_log.h" 20 #include "components/omnibox/browser/omnibox_log.h"
21 #include "components/prefs/pref_service.h"
22 #include "components/search_engines/template_url.h" 22 #include "components/search_engines/template_url.h"
23 #include "components/search_engines/template_url_service.h" 23 #include "components/search_engines/template_url_service.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "content/public/browser/navigation_controller.h" 25 #include "content/public/browser/navigation_controller.h"
26 #include "content/public/browser/navigation_details.h" 26 #include "content/public/browser/navigation_details.h"
27 #include "content/public/browser/navigation_entry.h" 27 #include "content/public/browser/navigation_entry.h"
28 #include "content/public/browser/notification_details.h" 28 #include "content/public/browser/notification_details.h"
29 #include "content/public/browser/notification_service.h" 29 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/notification_source.h" 30 #include "content/public/browser/notification_source.h"
31 #include "content/public/common/content_switches.h" 31 #include "content/public/common/content_switches.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // 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
225 // there to keep the old behavior. 225 // there to keep the old behavior.
226 if (!log->is_popup_open) 226 if (!log->is_popup_open)
227 return; 227 return;
228 228
229 omnibox_url_opened_subscription_.reset(); 229 omnibox_url_opened_subscription_.reset();
230 base::Closure omnibox_callback; 230 base::Closure omnibox_callback;
231 swap(omnibox_callback, on_omnibox_search_callback_); 231 swap(omnibox_callback, on_omnibox_search_callback_);
232 omnibox_callback.Run(); 232 omnibox_callback.Run();
233 } 233 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_preferences_util.cc ('k') | chrome/browser/safe_browsing/client_side_detection_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698