diff options
| author | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 04:00:39 +0000 |
|---|---|---|
| committer | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 04:00:39 +0000 |
| commit | db7a6f3162fe59a320f3c007fc707f32c1645b8a (patch) | |
| tree | ea2b0693f148eab37cb97f4b49da06fe57a78dd6 /chrome/browser | |
| parent | 6085ccd5ba53e8ce285c88b23dfd049703b7f879 (diff) | |
| download | chromium_src-db7a6f3162fe59a320f3c007fc707f32c1645b8a.zip chromium_src-db7a6f3162fe59a320f3c007fc707f32c1645b8a.tar.gz chromium_src-db7a6f3162fe59a320f3c007fc707f32c1645b8a.tar.bz2 | |
Fix Panel link errors on Android
Chrome on Android does not support Panels, so ifdef out references to it.
BUG=113487
TEST=
Review URL: http://codereview.chromium.org/9521008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_module.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.cc | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index bd3ff79..f0d2611 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -567,7 +567,10 @@ bool CreateWindowFunction::RunImpl() { extension_id = GetExtension()->id(); } else if (type_str == keys::kWindowTypeValuePanel) { extension_id = GetExtension()->id(); - bool use_panels = PanelManager::ShouldUsePanels(extension_id); + bool use_panels = false; +#if !defined(OS_ANDROID) + use_panels = PanelManager::ShouldUsePanels(extension_id); +#endif #if defined(USE_AURA) if (CommandLine::ForCurrentProcess()->HasSwitch( ash::switches::kAuraPanelManager)) diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 4e546fa..8b37cdb 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -518,7 +518,9 @@ Browser* Browser::CreateForApp(Type type, DCHECK(type != TYPE_TABBED); DCHECK(!app_name.empty()); -#if !defined(OS_CHROMEOS) || defined(USE_AURA) + // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from + // Android build. +#if (!defined(OS_CHROMEOS) || defined(USE_AURA)) && !defined(OS_ANDROID) if (type == TYPE_PANEL && !PanelManager::ShouldUsePanels( web_app::GetExtensionIdFromApplicationName(app_name))) { @@ -4587,12 +4589,12 @@ void Browser::ShowFirstRunBubble() { // Browser, protected: BrowserWindow* Browser::CreateBrowserWindow() { - bool create_panel = false; -#if !defined(OS_CHROMEOS) || defined(USE_AURA) - create_panel = is_type_panel(); -#endif - if (create_panel) + // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from + // Android build. +#if (!defined(OS_CHROMEOS) || defined(USE_AURA)) && !defined(OS_ANDROID) + if (is_type_panel()) return PanelManager::GetInstance()->CreatePanel(this); +#endif return BrowserWindow::CreateBrowserWindow(this); } |