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

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

Issue 12321107: Move shell integration code from chrome/browser to apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 #include "net/cookies/cookie_monster.h" 181 #include "net/cookies/cookie_monster.h"
182 #include "net/url_request/url_request_context.h" 182 #include "net/url_request/url_request_context.h"
183 #include "ui/base/l10n/l10n_util.h" 183 #include "ui/base/l10n/l10n_util.h"
184 #include "ui/base/window_open_disposition.h" 184 #include "ui/base/window_open_disposition.h"
185 #include "ui/gfx/point.h" 185 #include "ui/gfx/point.h"
186 #include "ui/shell_dialogs/selected_file_info.h" 186 #include "ui/shell_dialogs/selected_file_info.h"
187 #include "webkit/glue/webkit_glue.h" 187 #include "webkit/glue/webkit_glue.h"
188 #include "webkit/plugins/webplugininfo.h" 188 #include "webkit/plugins/webplugininfo.h"
189 189
190 #if defined(OS_WIN) 190 #if defined(OS_WIN)
191 #include "apps/shell_integration.h"
191 #include "base/win/metro.h" 192 #include "base/win/metro.h"
192 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" 193 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
193 #include "chrome/browser/shell_integration.h"
194 #include "chrome/browser/ssl/ssl_error_info.h" 194 #include "chrome/browser/ssl/ssl_error_info.h"
195 #include "chrome/browser/task_manager/task_manager.h" 195 #include "chrome/browser/task_manager/task_manager.h"
196 #include "chrome/browser/ui/view_ids.h" 196 #include "chrome/browser/ui/view_ids.h"
197 #include "ui/base/win/shell.h" 197 #include "ui/base/win/shell.h"
198 #endif // OS_WIN 198 #endif // OS_WIN
199 199
200 #if defined(OS_CHROMEOS) 200 #if defined(OS_CHROMEOS)
201 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" 201 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
202 #endif 202 #endif
203 203
(...skipping 2074 matching lines...) Expand 10 before | Expand all | Expand 10 after
2278 if (contents && !allow_js_access) { 2278 if (contents && !allow_js_access) {
2279 contents->web_contents()->GetController().LoadURL( 2279 contents->web_contents()->GetController().LoadURL(
2280 target_url, 2280 target_url,
2281 content::Referrer(), 2281 content::Referrer(),
2282 content::PAGE_TRANSITION_LINK, 2282 content::PAGE_TRANSITION_LINK,
2283 std::string()); // No extra headers. 2283 std::string()); // No extra headers.
2284 } 2284 }
2285 2285
2286 return contents != NULL; 2286 return contents != NULL;
2287 } 2287 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698