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

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

Issue 847703003: Refactor to move chrome_page_zoom functions to components/ui/zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac compile. Created 5 years, 11 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/resources/pdf/viewport.js ('k') | chrome/browser/ui/browser_commands.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.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 // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 18 matching lines...) Expand all
29 #include "chrome/app/chrome_command_ids.h" 29 #include "chrome/app/chrome_command_ids.h"
30 #include "chrome/browser/app_mode/app_mode_utils.h" 30 #include "chrome/browser/app_mode/app_mode_utils.h"
31 #include "chrome/browser/autofill/personal_data_manager_factory.h" 31 #include "chrome/browser/autofill/personal_data_manager_factory.h"
32 #include "chrome/browser/background/background_contents.h" 32 #include "chrome/browser/background/background_contents.h"
33 #include "chrome/browser/background/background_contents_service.h" 33 #include "chrome/browser/background/background_contents_service.h"
34 #include "chrome/browser/background/background_contents_service_factory.h" 34 #include "chrome/browser/background/background_contents_service_factory.h"
35 #include "chrome/browser/browser_process.h" 35 #include "chrome/browser/browser_process.h"
36 #include "chrome/browser/browser_shutdown.h" 36 #include "chrome/browser/browser_shutdown.h"
37 #include "chrome/browser/character_encoding.h" 37 #include "chrome/browser/character_encoding.h"
38 #include "chrome/browser/chrome_notification_types.h" 38 #include "chrome/browser/chrome_notification_types.h"
39 #include "chrome/browser/chrome_page_zoom.h"
40 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 39 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
41 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 40 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
42 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 41 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
43 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h" 42 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_deleg ate.h"
44 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_re quest.h" 43 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_re quest.h"
45 #include "chrome/browser/defaults.h" 44 #include "chrome/browser/defaults.h"
46 #include "chrome/browser/devtools/devtools_toggle_action.h" 45 #include "chrome/browser/devtools/devtools_toggle_action.h"
47 #include "chrome/browser/devtools/devtools_window.h" 46 #include "chrome/browser/devtools/devtools_window.h"
48 #include "chrome/browser/download/download_item_model.h" 47 #include "chrome/browser/download/download_item_model.h"
49 #include "chrome/browser/download/download_service.h" 48 #include "chrome/browser/download/download_service.h"
(...skipping 2460 matching lines...) Expand 10 before | Expand all | Expand 10 after
2510 if (contents && !allow_js_access) { 2509 if (contents && !allow_js_access) {
2511 contents->web_contents()->GetController().LoadURL( 2510 contents->web_contents()->GetController().LoadURL(
2512 target_url, 2511 target_url,
2513 content::Referrer(), 2512 content::Referrer(),
2514 ui::PAGE_TRANSITION_LINK, 2513 ui::PAGE_TRANSITION_LINK,
2515 std::string()); // No extra headers. 2514 std::string()); // No extra headers.
2516 } 2515 }
2517 2516
2518 return contents != NULL; 2517 return contents != NULL;
2519 } 2518 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/pdf/viewport.js ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698