| OLD | NEW |
| 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 1406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1417 } | 1417 } |
| 1418 | 1418 |
| 1419 void Browser::ShowFirstRunBubble() { | 1419 void Browser::ShowFirstRunBubble() { |
| 1420 window()->GetLocationBar()->ShowFirstRunBubble(); | 1420 window()->GetLocationBar()->ShowFirstRunBubble(); |
| 1421 } | 1421 } |
| 1422 | 1422 |
| 1423 /////////////////////////////////////////////////////////////////////////////// | 1423 /////////////////////////////////////////////////////////////////////////////// |
| 1424 // Browser, protected: | 1424 // Browser, protected: |
| 1425 | 1425 |
| 1426 BrowserWindow* Browser::CreateBrowserWindow() { | 1426 BrowserWindow* Browser::CreateBrowserWindow() { |
| 1427 bool create_panel = false; | 1427 #if !defined(USE_ASH) |
| 1428 #if defined(USE_ASH) | 1428 if (is_type_panel()) |
| 1429 if (CommandLine::ForCurrentProcess()->HasSwitch( | 1429 return PanelManager::GetInstance()->CreatePanel(this)->browser_window(); |
| 1430 ash::switches::kAuraPanelManager)) | |
| 1431 create_panel = is_type_panel(); | |
| 1432 #elif !defined(OS_CHROMEOS) | |
| 1433 create_panel = is_type_panel(); | |
| 1434 #endif | 1430 #endif |
| 1435 if (create_panel) | |
| 1436 return PanelManager::GetInstance()->CreatePanel(this)->browser_window(); | |
| 1437 | |
| 1438 return BrowserWindow::CreateBrowserWindow(this); | 1431 return BrowserWindow::CreateBrowserWindow(this); |
| 1439 } | 1432 } |
| 1440 | 1433 |
| 1441 /////////////////////////////////////////////////////////////////////////////// | 1434 /////////////////////////////////////////////////////////////////////////////// |
| 1442 // Browser, content::WebContentsDelegate implementation: | 1435 // Browser, content::WebContentsDelegate implementation: |
| 1443 | 1436 |
| 1444 WebContents* Browser::OpenURLFromTab(WebContents* source, | 1437 WebContents* Browser::OpenURLFromTab(WebContents* source, |
| 1445 const OpenURLParams& params) { | 1438 const OpenURLParams& params) { |
| 1446 chrome::NavigateParams nav_params(this, params.url, params.transition); | 1439 chrome::NavigateParams nav_params(this, params.url, params.transition); |
| 1447 nav_params.source_contents = chrome::GetTabContentsAt(this, | 1440 nav_params.source_contents = chrome::GetTabContentsAt(this, |
| (...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2731 if (contents && !allow_js_access) { | 2724 if (contents && !allow_js_access) { |
| 2732 contents->web_contents()->GetController().LoadURL( | 2725 contents->web_contents()->GetController().LoadURL( |
| 2733 target_url, | 2726 target_url, |
| 2734 content::Referrer(), | 2727 content::Referrer(), |
| 2735 content::PAGE_TRANSITION_LINK, | 2728 content::PAGE_TRANSITION_LINK, |
| 2736 std::string()); // No extra headers. | 2729 std::string()); // No extra headers. |
| 2737 } | 2730 } |
| 2738 | 2731 |
| 2739 return contents != NULL; | 2732 return contents != NULL; |
| 2740 } | 2733 } |
| OLD | NEW |