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

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

Issue 10384086: Moved url_utils from chrome/browser/net to chrome/common/net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "chrome/browser/extensions/extension_tabs_module.h" 58 #include "chrome/browser/extensions/extension_tabs_module.h"
59 #include "chrome/browser/favicon/favicon_tab_helper.h" 59 #include "chrome/browser/favicon/favicon_tab_helper.h"
60 #include "chrome/browser/file_select_helper.h" 60 #include "chrome/browser/file_select_helper.h"
61 #include "chrome/browser/first_run/first_run.h" 61 #include "chrome/browser/first_run/first_run.h"
62 #include "chrome/browser/google/google_url_tracker.h" 62 #include "chrome/browser/google/google_url_tracker.h"
63 #include "chrome/browser/infobars/infobar_tab_helper.h" 63 #include "chrome/browser/infobars/infobar_tab_helper.h"
64 #include "chrome/browser/instant/instant_controller.h" 64 #include "chrome/browser/instant/instant_controller.h"
65 #include "chrome/browser/instant/instant_unload_handler.h" 65 #include "chrome/browser/instant/instant_unload_handler.h"
66 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h" 66 #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
67 #include "chrome/browser/intents/web_intents_util.h" 67 #include "chrome/browser/intents/web_intents_util.h"
68 #include "chrome/browser/net/browser_url_util.h"
69 #include "chrome/browser/net/url_fixer_upper.h" 68 #include "chrome/browser/net/url_fixer_upper.h"
70 #include "chrome/browser/notifications/notification_ui_manager.h" 69 #include "chrome/browser/notifications/notification_ui_manager.h"
71 #include "chrome/browser/platform_util.h" 70 #include "chrome/browser/platform_util.h"
72 #include "chrome/browser/prefs/incognito_mode_prefs.h" 71 #include "chrome/browser/prefs/incognito_mode_prefs.h"
73 #include "chrome/browser/prefs/pref_service.h" 72 #include "chrome/browser/prefs/pref_service.h"
74 #include "chrome/browser/prerender/prerender_manager.h" 73 #include "chrome/browser/prerender/prerender_manager.h"
75 #include "chrome/browser/prerender/prerender_manager_factory.h" 74 #include "chrome/browser/prerender/prerender_manager_factory.h"
76 #include "chrome/browser/prerender/prerender_tab_helper.h" 75 #include "chrome/browser/prerender/prerender_tab_helper.h"
77 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 76 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
78 #include "chrome/browser/printing/print_preview_tab_controller.h" 77 #include "chrome/browser/printing/print_preview_tab_controller.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 139 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
141 #include "chrome/browser/ui/window_sizer.h" 140 #include "chrome/browser/ui/window_sizer.h"
142 #include "chrome/browser/upgrade_detector.h" 141 #include "chrome/browser/upgrade_detector.h"
143 #include "chrome/browser/web_applications/web_app.h" 142 #include "chrome/browser/web_applications/web_app.h"
144 #include "chrome/common/chrome_constants.h" 143 #include "chrome/common/chrome_constants.h"
145 #include "chrome/common/chrome_notification_types.h" 144 #include "chrome/common/chrome_notification_types.h"
146 #include "chrome/common/chrome_switches.h" 145 #include "chrome/common/chrome_switches.h"
147 #include "chrome/common/custom_handlers/protocol_handler.h" 146 #include "chrome/common/custom_handlers/protocol_handler.h"
148 #include "chrome/common/extensions/extension.h" 147 #include "chrome/common/extensions/extension.h"
149 #include "chrome/common/extensions/extension_constants.h" 148 #include "chrome/common/extensions/extension_constants.h"
149 #include "chrome/common/net/url_util.h"
150 #include "chrome/common/pref_names.h" 150 #include "chrome/common/pref_names.h"
151 #include "chrome/common/profiling.h" 151 #include "chrome/common/profiling.h"
152 #include "chrome/common/url_constants.h" 152 #include "chrome/common/url_constants.h"
153 #include "chrome/common/web_apps.h" 153 #include "chrome/common/web_apps.h"
154 #include "content/public/browser/color_chooser.h" 154 #include "content/public/browser/color_chooser.h"
155 #include "content/public/browser/devtools_manager.h" 155 #include "content/public/browser/devtools_manager.h"
156 #include "content/public/browser/download_item.h" 156 #include "content/public/browser/download_item.h"
157 #include "content/public/browser/download_manager.h" 157 #include "content/public/browser/download_manager.h"
158 #include "content/public/browser/interstitial_page.h" 158 #include "content/public/browser/interstitial_page.h"
159 #include "content/public/browser/invalidate_type.h" 159 #include "content/public/browser/invalidate_type.h"
(...skipping 1590 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 1750
1751 void Browser::WriteCurrentURLToClipboard() { 1751 void Browser::WriteCurrentURLToClipboard() {
1752 // TODO(ericu): There isn't currently a metric for this. Should there be? 1752 // TODO(ericu): There isn't currently a metric for this. Should there be?
1753 // We don't appear to track the action when it comes from the 1753 // We don't appear to track the action when it comes from the
1754 // RenderContextViewMenu. 1754 // RenderContextViewMenu.
1755 1755
1756 WebContents* contents = GetSelectedWebContents(); 1756 WebContents* contents = GetSelectedWebContents();
1757 if (!toolbar_model_->ShouldDisplayURL()) 1757 if (!toolbar_model_->ShouldDisplayURL())
1758 return; 1758 return;
1759 1759
1760 chrome_browser_net::WriteURLToClipboard( 1760 chrome_common_net::WriteURLToClipboard(
1761 contents->GetURL(), 1761 contents->GetURL(),
1762 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), 1762 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
1763 g_browser_process->clipboard()); 1763 g_browser_process->clipboard());
1764 } 1764 }
1765 1765
1766 void Browser::ConvertPopupToTabbedBrowser() { 1766 void Browser::ConvertPopupToTabbedBrowser() {
1767 content::RecordAction(UserMetricsAction("ShowAsTab")); 1767 content::RecordAction(UserMetricsAction("ShowAsTab"));
1768 TabContentsWrapper* contents = tab_strip_model_->DetachTabContentsAt( 1768 TabContentsWrapper* contents = tab_strip_model_->DetachTabContentsAt(
1769 active_index()); 1769 active_index());
1770 Browser* browser = Browser::Create(profile_); 1770 Browser* browser = Browser::Create(profile_);
(...skipping 3716 matching lines...) Expand 10 before | Expand all | Expand 10 after
5487 if (contents && !allow_js_access) { 5487 if (contents && !allow_js_access) {
5488 contents->web_contents()->GetController().LoadURL( 5488 contents->web_contents()->GetController().LoadURL(
5489 target_url, 5489 target_url,
5490 content::Referrer(), 5490 content::Referrer(),
5491 content::PAGE_TRANSITION_LINK, 5491 content::PAGE_TRANSITION_LINK,
5492 std::string()); // No extra headers. 5492 std::string()); // No extra headers.
5493 } 5493 }
5494 5494
5495 return contents != NULL; 5495 return contents != NULL;
5496 } 5496 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/web_resource/notification_promo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698