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

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

Issue 16702003: Move ShellWindow into apps component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yar Created 7 years, 5 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "chrome/browser/ui/browser_navigator.h" 100 #include "chrome/browser/ui/browser_navigator.h"
101 #include "chrome/browser/ui/browser_tab_contents.h" 101 #include "chrome/browser/ui/browser_tab_contents.h"
102 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" 102 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
103 #include "chrome/browser/ui/browser_tab_strip_model_delegate.h" 103 #include "chrome/browser/ui/browser_tab_strip_model_delegate.h"
104 #include "chrome/browser/ui/browser_tabstrip.h" 104 #include "chrome/browser/ui/browser_tabstrip.h"
105 #include "chrome/browser/ui/browser_toolbar_model_delegate.h" 105 #include "chrome/browser/ui/browser_toolbar_model_delegate.h"
106 #include "chrome/browser/ui/browser_ui_prefs.h" 106 #include "chrome/browser/ui/browser_ui_prefs.h"
107 #include "chrome/browser/ui/browser_window.h" 107 #include "chrome/browser/ui/browser_window.h"
108 #include "chrome/browser/ui/chrome_pages.h" 108 #include "chrome/browser/ui/chrome_pages.h"
109 #include "chrome/browser/ui/chrome_select_file_policy.h" 109 #include "chrome/browser/ui/chrome_select_file_policy.h"
110 #include "chrome/browser/ui/extensions/shell_window.h"
111 #include "chrome/browser/ui/find_bar/find_bar.h" 110 #include "chrome/browser/ui/find_bar/find_bar.h"
112 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 111 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
113 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 112 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
114 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 113 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
115 #include "chrome/browser/ui/global_error/global_error.h" 114 #include "chrome/browser/ui/global_error/global_error.h"
116 #include "chrome/browser/ui/global_error/global_error_service.h" 115 #include "chrome/browser/ui/global_error/global_error_service.h"
117 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 116 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
118 #include "chrome/browser/ui/omnibox/location_bar.h" 117 #include "chrome/browser/ui/omnibox/location_bar.h"
119 #include "chrome/browser/ui/search/search_delegate.h" 118 #include "chrome/browser/ui/search/search_delegate.h"
120 #include "chrome/browser/ui/search/search_model.h" 119 #include "chrome/browser/ui/search/search_model.h"
(...skipping 2093 matching lines...) Expand 10 before | Expand all | Expand 10 after
2214 if (contents && !allow_js_access) { 2213 if (contents && !allow_js_access) {
2215 contents->web_contents()->GetController().LoadURL( 2214 contents->web_contents()->GetController().LoadURL(
2216 target_url, 2215 target_url,
2217 content::Referrer(), 2216 content::Referrer(),
2218 content::PAGE_TRANSITION_LINK, 2217 content::PAGE_TRANSITION_LINK,
2219 std::string()); // No extra headers. 2218 std::string()); // No extra headers.
2220 } 2219 }
2221 2220
2222 return contents != NULL; 2221 return contents != NULL;
2223 } 2222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698