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

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

Issue 10689071: Deprecate --aura-panels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 (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 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after
1608 } 1608 }
1609 1609
1610 void Browser::ShowFirstRunBubble() { 1610 void Browser::ShowFirstRunBubble() {
1611 window()->GetLocationBar()->ShowFirstRunBubble(); 1611 window()->GetLocationBar()->ShowFirstRunBubble();
1612 } 1612 }
1613 1613
1614 /////////////////////////////////////////////////////////////////////////////// 1614 ///////////////////////////////////////////////////////////////////////////////
1615 // Browser, protected: 1615 // Browser, protected:
1616 1616
1617 BrowserWindow* Browser::CreateBrowserWindow() { 1617 BrowserWindow* Browser::CreateBrowserWindow() {
1618 bool create_panel = false; 1618 #if !defined(USE_ASH)
1619 #if defined(USE_ASH) 1619 if (is_type_panel())
1620 if (CommandLine::ForCurrentProcess()->HasSwitch( 1620 return PanelManager::GetInstance()->CreatePanel(this)->browser_window();
1621 ash::switches::kAuraPanelManager))
1622 create_panel = is_type_panel();
1623 #elif !defined(OS_CHROMEOS)
1624 create_panel = is_type_panel();
1625 #endif 1621 #endif
1626 if (create_panel)
1627 return PanelManager::GetInstance()->CreatePanel(this)->browser_window();
1628
1629 return BrowserWindow::CreateBrowserWindow(this); 1622 return BrowserWindow::CreateBrowserWindow(this);
1630 } 1623 }
1631 1624
1632 /////////////////////////////////////////////////////////////////////////////// 1625 ///////////////////////////////////////////////////////////////////////////////
1633 // Browser, content::WebContentsDelegate implementation: 1626 // Browser, content::WebContentsDelegate implementation:
1634 1627
1635 WebContents* Browser::OpenURLFromTab(WebContents* source, 1628 WebContents* Browser::OpenURLFromTab(WebContents* source,
1636 const OpenURLParams& params) { 1629 const OpenURLParams& params) {
1637 browser::NavigateParams nav_params(this, params.url, params.transition); 1630 browser::NavigateParams nav_params(this, params.url, params.transition);
1638 nav_params.source_contents = GetTabContentsAt( 1631 nav_params.source_contents = GetTabContentsAt(
(...skipping 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after
3034 if (contents && !allow_js_access) { 3027 if (contents && !allow_js_access) {
3035 contents->web_contents()->GetController().LoadURL( 3028 contents->web_contents()->GetController().LoadURL(
3036 target_url, 3029 target_url,
3037 content::Referrer(), 3030 content::Referrer(),
3038 content::PAGE_TRANSITION_LINK, 3031 content::PAGE_TRANSITION_LINK,
3039 std::string()); // No extra headers. 3032 std::string()); // No extra headers.
3040 } 3033 }
3041 3034
3042 return contents != NULL; 3035 return contents != NULL;
3043 } 3036 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698