When we open a popup window from an app window, we used to identify this popu...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 966 matching lines @@
 
 views::View* BrowserView::GetInitiallyFocusedView() {
   return toolbar_->GetLocationBarView();
 }
 
 bool BrowserView::ShouldShowWindowTitle() const {
   return SupportsWindowFeature(FEATURE_TITLEBAR);
 }
 
 SkBitmap BrowserView::GetWindowIcon() {
-  if (browser_->type() == Browser::TYPE_APP)
+  if (browser_->type() & Browser::TYPE_APP)
     return browser_->GetCurrentPageIcon();
   return SkBitmap();
 }
 
 bool BrowserView::ShouldShowWindowIcon() const {
   return SupportsWindowFeature(FEATURE_TITLEBAR);
 }
 
 bool BrowserView::ExecuteWindowsCommand(int command_id) {
   // Translate WM_APPCOMMAND command ids into a command id that the browser
@@ skipping 21 matching lines @@
   // catching the going-into-fullscreen sizing and positioning calls, which we
   // want to ignore.
   if (!fullscreen_ && browser_->ShouldSaveWindowPlacement()) {
     WindowDelegate::SaveWindowPlacement(bounds, maximized, always_on_top);
     browser_->SaveWindowPlacement(bounds, maximized);
   }
 }
 
 bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const {
   *bounds = browser_->GetSavedWindowBounds();
-  if (browser_->type() == Browser::TYPE_POPUP) {
+  if (browser_->type() & Browser::TYPE_POPUP) {
     // We are a popup window. The value passed in |bounds| represents two
     // pieces of information:
     // - the position of the window, in screen coordinates (outer position).
     // - the size of the content area (inner size).
     // We need to use these values to determine the appropriate size and
     // position of the resulting window.
     if (IsToolbarVisible()) {
       // If we're showing the toolbar, we need to adjust |*bounds| to include
       // its desired height, since the toolbar is considered part of the
       // window's client area as far as GetWindowBoundsForClientBounds is
@@ skipping 256 matching lines @@
 
 bool BrowserView::SupportsWindowFeature(WindowFeature feature) const {
   unsigned int features = FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF;
   if (IsBrowserTypeNormal())
      features |= FEATURE_BOOKMARKBAR;
   if (!fullscreen_) {
     if (IsBrowserTypeNormal())
       features |= FEATURE_TABSTRIP | FEATURE_TOOLBAR;
     else
       features |= FEATURE_TITLEBAR;
-    if (browser_->type() != Browser::TYPE_APP)
+    if ((browser_->type() & Browser::TYPE_APP) == 0)
       features |= FEATURE_LOCATIONBAR;
   }
   return !!(features & feature);
 }
 
 bool BrowserView::ShouldForwardToTabStrip(
     const views::DropTargetEvent& event) {
   if (!tabstrip_->IsVisible())
     return false;
 
@@ skipping 350 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }