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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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 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" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 52 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
53 #include "chrome/browser/ui/tabs/tab_strip_model.h" 53 #include "chrome/browser/ui/tabs/tab_strip_model.h"
54 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 54 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
55 #include "chrome/browser/upgrade_detector.h" 55 #include "chrome/browser/upgrade_detector.h"
56 #include "chrome/browser/web_applications/web_app.h" 56 #include "chrome/browser/web_applications/web_app.h"
57 #include "chrome/common/chrome_switches.h" 57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/chrome_version_info.h" 58 #include "chrome/common/chrome_version_info.h"
59 #include "chrome/common/content_restriction.h" 59 #include "chrome/common/content_restriction.h"
60 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 60 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
61 #include "chrome/common/pref_names.h" 61 #include "chrome/common/pref_names.h"
62 #include "components/bookmarks/core/browser/bookmark_model.h" 62 #include "components/bookmarks/browser/bookmark_model.h"
63 #include "components/bookmarks/core/browser/bookmark_utils.h" 63 #include "components/bookmarks/browser/bookmark_utils.h"
64 #include "components/web_modal/web_contents_modal_dialog_manager.h" 64 #include "components/web_modal/web_contents_modal_dialog_manager.h"
65 #include "content/public/browser/devtools_agent_host.h" 65 #include "content/public/browser/devtools_agent_host.h"
66 #include "content/public/browser/navigation_controller.h" 66 #include "content/public/browser/navigation_controller.h"
67 #include "content/public/browser/navigation_entry.h" 67 #include "content/public/browser/navigation_entry.h"
68 #include "content/public/browser/notification_service.h" 68 #include "content/public/browser/notification_service.h"
69 #include "content/public/browser/page_navigator.h" 69 #include "content/public/browser/page_navigator.h"
70 #include "content/public/browser/render_view_host.h" 70 #include "content/public/browser/render_view_host.h"
71 #include "content/public/browser/render_widget_host_view.h" 71 #include "content/public/browser/render_widget_host_view.h"
72 #include "content/public/browser/user_metrics.h" 72 #include "content/public/browser/user_metrics.h"
73 #include "content/public/browser/web_contents.h" 73 #include "content/public/browser/web_contents.h"
(...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 browser->profile(), 1257 browser->profile(),
1258 browser->host_desktop_type())); 1258 browser->host_desktop_type()));
1259 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1259 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1260 1260
1261 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1261 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1262 contents->GetRenderViewHost()->SyncRendererPrefs(); 1262 contents->GetRenderViewHost()->SyncRendererPrefs();
1263 app_browser->window()->Show(); 1263 app_browser->window()->Show();
1264 } 1264 }
1265 1265
1266 } // namespace chrome 1266 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698