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

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

Issue 17392006: In components/autofill, move browser/ to core/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to fix conflicts Created 7 years, 6 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 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 #include "ui/gfx/point.h" 184 #include "ui/gfx/point.h"
185 #include "ui/shell_dialogs/selected_file_info.h" 185 #include "ui/shell_dialogs/selected_file_info.h"
186 #include "webkit/plugins/webplugininfo.h" 186 #include "webkit/plugins/webplugininfo.h"
187 187
188 #if defined(OS_WIN) 188 #if defined(OS_WIN)
189 #include "base/win/metro.h" 189 #include "base/win/metro.h"
190 #include "chrome/browser/shell_integration.h" 190 #include "chrome/browser/shell_integration.h"
191 #include "chrome/browser/ssl/ssl_error_info.h" 191 #include "chrome/browser/ssl/ssl_error_info.h"
192 #include "chrome/browser/task_manager/task_manager.h" 192 #include "chrome/browser/task_manager/task_manager.h"
193 #include "chrome/browser/ui/view_ids.h" 193 #include "chrome/browser/ui/view_ids.h"
194 #include "components/autofill/browser/autofill_ie_toolbar_import_win.h" 194 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
195 #include "ui/base/win/shell.h" 195 #include "ui/base/win/shell.h"
196 #include "ui/views/win/hwnd_util.h" 196 #include "ui/views/win/hwnd_util.h"
197 #endif // OS_WIN 197 #endif // OS_WIN
198 198
199 #if defined(OS_CHROMEOS) 199 #if defined(OS_CHROMEOS)
200 #include "chrome/browser/chromeos/drive/file_system_util.h" 200 #include "chrome/browser/chromeos/drive/file_system_util.h"
201 #endif 201 #endif
202 202
203 #if defined(USE_ASH) 203 #if defined(USE_ASH)
204 #include "ash/ash_switches.h" 204 #include "ash/ash_switches.h"
(...skipping 2007 matching lines...) Expand 10 before | Expand all | Expand 10 after
2212 if (contents && !allow_js_access) { 2212 if (contents && !allow_js_access) {
2213 contents->web_contents()->GetController().LoadURL( 2213 contents->web_contents()->GetController().LoadURL(
2214 target_url, 2214 target_url,
2215 content::Referrer(), 2215 content::Referrer(),
2216 content::PAGE_TRANSITION_LINK, 2216 content::PAGE_TRANSITION_LINK,
2217 std::string()); // No extra headers. 2217 std::string()); // No extra headers.
2218 } 2218 }
2219 2219
2220 return contents != NULL; 2220 return contents != NULL;
2221 } 2221 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/autofill/tab_autofill_manager_delegate.h ('k') | chrome/browser/ui/browser_tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698