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

Side by Side Diff: chrome/browser/ui/browser_commands.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
« no previous file with comments | « chrome/browser/ui/browser_command_controller.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_commands.h" 5 #include "chrome/browser/ui/browser_commands.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
11 #include "build/build_config.h" 10 #include "build/build_config.h"
12 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
13 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
14 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/browsing_data/browsing_data_helper.h" 14 #include "chrome/browser/browsing_data/browsing_data_helper.h"
16 #include "chrome/browser/browsing_data/browsing_data_remover.h" 15 #include "chrome/browser/browsing_data/browsing_data_remover.h"
17 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" 16 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
18 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/devtools/devtools_window.h" 18 #include "chrome/browser/devtools/devtools_window.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "chrome/browser/ui/tab_dialogs.h" 52 #include "chrome/browser/ui/tab_dialogs.h"
54 #include "chrome/browser/ui/tabs/tab_strip_model.h" 53 #include "chrome/browser/ui/tabs/tab_strip_model.h"
55 #include "chrome/browser/upgrade_detector.h" 54 #include "chrome/browser/upgrade_detector.h"
56 #include "chrome/common/content_restriction.h" 55 #include "chrome/common/content_restriction.h"
57 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
58 #include "components/bookmarks/browser/bookmark_model.h" 57 #include "components/bookmarks/browser/bookmark_model.h"
59 #include "components/bookmarks/browser/bookmark_utils.h" 58 #include "components/bookmarks/browser/bookmark_utils.h"
60 #include "components/bookmarks/common/bookmark_pref_names.h" 59 #include "components/bookmarks/common/bookmark_pref_names.h"
61 #include "components/favicon/content/content_favicon_driver.h" 60 #include "components/favicon/content/content_favicon_driver.h"
62 #include "components/google/core/browser/google_util.h" 61 #include "components/google/core/browser/google_util.h"
62 #include "components/prefs/pref_service.h"
63 #include "components/sessions/core/live_tab_context.h" 63 #include "components/sessions/core/live_tab_context.h"
64 #include "components/sessions/core/tab_restore_service.h" 64 #include "components/sessions/core/tab_restore_service.h"
65 #include "components/signin/core/browser/signin_header_helper.h" 65 #include "components/signin/core/browser/signin_header_helper.h"
66 #include "components/translate/core/browser/language_state.h" 66 #include "components/translate/core/browser/language_state.h"
67 #include "components/ui/zoom/page_zoom.h" 67 #include "components/ui/zoom/page_zoom.h"
68 #include "components/ui/zoom/zoom_controller.h" 68 #include "components/ui/zoom/zoom_controller.h"
69 #include "components/version_info/version_info.h" 69 #include "components/version_info/version_info.h"
70 #include "components/web_modal/web_contents_modal_dialog_manager.h" 70 #include "components/web_modal/web_contents_modal_dialog_manager.h"
71 #include "content/public/browser/devtools_agent_host.h" 71 #include "content/public/browser/devtools_agent_host.h"
72 #include "content/public/browser/navigation_controller.h" 72 #include "content/public/browser/navigation_controller.h"
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 browser->host_desktop_type())); 1309 browser->host_desktop_type()));
1310 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1310 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1311 1311
1312 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1312 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1313 contents->GetRenderViewHost()->SyncRendererPrefs(); 1313 contents->GetRenderViewHost()->SyncRendererPrefs();
1314 app_browser->window()->Show(); 1314 app_browser->window()->Show();
1315 } 1315 }
1316 #endif // defined(ENABLE_EXTENSIONS) 1316 #endif // defined(ENABLE_EXTENSIONS)
1317 1317
1318 } // namespace chrome 1318 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_command_controller.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698