Attemp 2 at:

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2010 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 "chrome/browser/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 82 matching lines @@
 // The number of milliseconds between loading animation frames.
 static const int kLoadingAnimationFrameTimeMs = 30;
 // The amount of space we expect the window border to take up.
 static const int kWindowBorderWidth = 5;
 
 // If not -1, windows are shown with this state.
 static int explicit_show_state = -1;
 
 // How round the 'new tab' style bookmarks bar is.
 static const int kNewtabBarRoundness = 5;
-
-// The maximum width of the big title shown for extension app windows.
-static const int kExtensionAppTitleMaxWidth = 150;
-
 // ------------
 
 // Returned from BrowserView::GetClassName.
 const char BrowserView::kViewClassName[] = "browser/views/BrowserView";
 
 #if defined(OS_CHROMEOS)
 // Get a normal browser window of given |profile| to use as dialog parent
 // if given |browser| is not one. Otherwise, returns browser window of
 // |browser|. If |profile| is NULL, |browser|'s profile is used to find the
 // normal browser.
@@ skipping 287 matching lines @@
   explicit_show_state = state;
 }
 
 BrowserView::BrowserView(Browser* browser)
     : views::ClientView(NULL, NULL),
       last_focused_view_storage_id_(
           views::ViewStorage::GetSharedInstance()->CreateStorageID()),
       frame_(NULL),
       browser_(browser),
       active_bookmark_bar_(NULL),
-      extension_app_icon_(NULL),
-      extension_app_title_(NULL),
       tabstrip_(NULL),
       toolbar_(NULL),
       infobar_container_(NULL),
       contents_container_(NULL),
       devtools_container_(NULL),
       contents_split_(NULL),
       initialized_(false),
       ignore_layout_(true),
 #if defined(OS_WIN)
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #endif
-      extension_shelf_(NULL),
-      extension_app_icon_loader_(this) {
+      extension_shelf_(NULL) {
   browser_->tabstrip_model()->AddObserver(this);
 }
 
 BrowserView::~BrowserView() {
   browser_->tabstrip_model()->RemoveObserver(this);
 
 #if defined(OS_WIN)
   // Remove this observer.
   if (aeropeek_manager_.get())
     browser_->tabstrip_model()->RemoveObserver(aeropeek_manager_.get());
@@ skipping 845 matching lines @@
   ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_V,
                             false, false, false, true);
 }
 #endif
 
 void BrowserView::ToggleTabStripMode() {
   InitTabStrip(browser_->tabstrip_model());
   frame_->TabStripDisplayModeChanged();
 }
 
-void BrowserView::SetToolbarCollapsedMode(bool val) {
-  toolbar_->SetCollapsed(val);
-  Layout();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindowTesting implementation:
 
 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
   return bookmark_bar_view_.get();
 }
 
 LocationBarView* BrowserView::GetLocationBarView() const {
   return toolbar_->location_bar();
 }
@@ skipping 401 matching lines @@
 
   BrowserTabStripController* tabstrip_controller =
       new BrowserTabStripController(model);
 
   if (UseVerticalTabs())
     tabstrip_ = new SideTabStrip(tabstrip_controller);
   else
     tabstrip_ = new TabStrip(tabstrip_controller);
 
   tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP));
-  if (browser_->extension_app() && tabstrip_->AsTabStrip())
-    tabstrip_->AsTabStrip()->set_new_tab_button_enabled(false);
   AddChildView(tabstrip_);
 
   tabstrip_controller->InitFromModel(tabstrip_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, private:
 
 void BrowserView::Init() {
   accessible_view_helper_.reset(new AccessibleViewHelper(
@@ skipping 12 matching lines @@
   // Start a hung plugin window detector for this browser object (as long as
   // hang detection is not disabled).
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableHangMonitor)) {
     InitHangMonitor();
   }
 
   LoadAccelerators();
   SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
-  if (browser_->extension_app()) {
-    extension_app_icon_ = new views::ImageView();
-    extension_app_icon_->SetID(VIEW_ID_EXTENSION_APP_ICON);
-    AddChildView(extension_app_icon_);
-
-    extension_app_title_ = new views::Label();
-    extension_app_title_->SetFont(
-        extension_app_title_->font().DeriveFont(1, gfx::Font::BOLD));
-    extension_app_title_->SetColor(SK_ColorWHITE);
-    extension_app_title_->SetID(VIEW_ID_EXTENSION_APP_TITLE);
-    AddChildView(extension_app_title_);
-
-    extension_app_icon_loader_.LoadImage(
-        browser_->extension_app(),
-        browser_->extension_app()->GetIconPath(
-            Extension::EXTENSION_ICON_MEDIUM),
-        gfx::Size(Extension::EXTENSION_ICON_SMALL,
-                  Extension::EXTENSION_ICON_SMALL),
-        ImageLoadingTracker::CACHE);
-
-    extension_app_title_->SetText(
-        UTF8ToWide(browser_->extension_app()->name()));
-    extension_app_title_->SizeToPreferredSize();
-
-    if (extension_app_title_->width() > kExtensionAppTitleMaxWidth) {
-      extension_app_title_->SetBounds(extension_app_title_->x(),
-                                      extension_app_title_->y(),
-                                      kExtensionAppTitleMaxWidth,
-                                      extension_app_title_->height());
-    }
-  }
-
   InitTabStrip(browser_->tabstrip_model());
 
   toolbar_ = new ToolbarView(browser_.get());
   AddChildView(toolbar_);
   toolbar_->Init(browser_->profile());
   toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR));
-  if (browser_->type() == Browser::TYPE_EXTENSION_APP)
-    toolbar_->SetCollapsed(true);
 
   infobar_container_ = new InfoBarContainer(this);
   AddChildView(infobar_container_);
 
   contents_container_ = new TabContentsContainer;
   devtools_container_ = new TabContentsContainer;
   devtools_container_->SetID(VIEW_ID_DEV_TOOLS_DOCKED);
   devtools_container_->SetVisible(false);
   contents_split_ = new views::SingleSplitView(
       contents_container_,
@@ skipping 52 matching lines @@
     BuildSystemMenuForBrowserWindow();
   else
     BuildSystemMenuForAppOrPopupWindow(browser_->type() == Browser::TYPE_APP);
   system_menu_.reset(
       new views::NativeMenuWin(system_menu_contents_.get(),
                                frame_->GetWindow()->GetNativeWindow()));
   system_menu_->Rebuild();
 }
 #endif
 
-void BrowserView::OnImageLoaded(SkBitmap* image, ExtensionResource resource,
-                                int index) {
-  if (image)
-    extension_app_icon_->SetImage(*image);
-}
-
 BrowserViewLayout* BrowserView::GetBrowserViewLayout() const {
   return static_cast<BrowserViewLayout*>(GetLayoutManager());
 }
 
 void BrowserView::LayoutStatusBubble(int top) {
   // In restored mode, the client area has a client edge between it and the
   // frame.
   int overlap = StatusBubbleViews::kShadowThickness +
       (IsMaximized() ? 0 : views::NonClientFrameView::kClientEdgeThickness);
   int x = -overlap;
@@ skipping 133 matching lines @@
   return changed;
 }
 
 void BrowserView::ProcessFullscreen(bool fullscreen) {
   // Reduce jankiness during the following position changes by:
   //   * Hiding the window until it's in the final position
   //   * Ignoring all intervening Layout() calls, which resize the webpage and
   //     thus are slow and look ugly
   ignore_layout_ = true;
   LocationBarView* location_bar = toolbar_->location_bar();
+#if defined(OS_WIN)
+  AutocompleteEditViewWin* edit_view =
+      static_cast<AutocompleteEditViewWin*>(location_bar->location_entry());
+#endif
   if (!fullscreen) {
     // Hide the fullscreen bubble as soon as possible, since the mode toggle can
     // take enough time for the user to notice.
     fullscreen_bubble_.reset();
   } else {
     // Move focus out of the location bar if necessary.
     views::FocusManager* focus_manager = GetFocusManager();
     DCHECK(focus_manager);
     if (focus_manager->GetFocusedView() == location_bar)
       focus_manager->ClearFocus();
 
+#if defined(OS_WIN)
     // If we don't hide the edit and force it to not show until we come out of
     // fullscreen, then if the user was on the New Tab Page, the edit contents
     // will appear atop the web contents once we go into fullscreen mode.  This
     // has something to do with how we move the main window while it's hidden;
     // if we don't hide the main window below, we don't get this problem.
-    location_bar->PushForceHidden();
+    edit_view->set_force_hidden(true);
+    ShowWindow(edit_view->m_hWnd, SW_HIDE);
+#endif
   }
 #if defined(OS_WIN)
   frame_->GetWindow()->PushForceHidden();
 #endif
 
   // Notify bookmark bar, so it can set itself to the appropriate drawing state.
   if (bookmark_bar_view_.get())
     bookmark_bar_view_->OnFullscreenToggled(fullscreen);
 
   // Notify extension shelf, so it can set itself to the appropriate drawing
@@ skipping 16 matching lines @@
 #endif
 
   if (fullscreen) {
     bool is_kiosk =
         CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
     if (!is_kiosk) {
       fullscreen_bubble_.reset(new FullscreenExitBubble(GetWidget(),
                                                         browser_.get()));
     }
   } else {
+#if defined(OS_WIN)
     // Show the edit again since we're no longer in fullscreen mode.
-    location_bar->PopForceHidden();
+    edit_view->set_force_hidden(false);
+    ShowWindow(edit_view->m_hWnd, SW_SHOW);
+#endif
   }
 
   // Undo our anti-jankiness hacks and force the window to relayout now that
   // it's in its final position.
   ignore_layout_ = false;
   Layout();
 #if defined(OS_WIN)
   frame_->GetWindow()->PopForceHidden();
 #endif
 }
@@ skipping 189 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }