Move compact navigation bar('s entry view) to main menu.

 * Chagned main menu to use TYPE_WINDOW instead of POPUP.
 * Added hooks to close main menu when a user clicked non content area.    (see MainMenuContainer::OnMousePressed and MainMenu::ActiveWindowChanged)
 * removed entry view from CompactNavigationBar view. We probably should rename this class (later).
 * Fixed a mouse coordinates issue in WidgetGtk: A location in the mouse event may not be in    its gdk_window when it's originated from child gdk_window.
 * UIStyle's enum has to start with 0  * removed DLOG thas I checked in by accident.

BUG=31766
TEST=manual: switch to compact navigation bar using ctrl-shift-c and confirm that no navigation entry in title bar.
  main menu has the navigation entry instead.

Review URL: http://codereview.chromium.org/604015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38816 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 30 deletions

diff --git a/chrome/browser/chromeos/compact_navigation_bar.h b/chrome/browser/chromeos/compact_navigation_bar.h
index 0e09c4d..3b15826 100644
--- a/chrome/browser/chromeos/compact_navigation_bar.h
+++ b/chrome/browser/chromeos/compact_navigation_bar.h
@@ -7,8 +7,6 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/autocomplete/autocomplete_edit.h"
-#include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/command_updater.h"
 #include "views/controls/button/button.h"
 #include "views/view.h"
@@ -29,8 +27,6 @@ namespace chromeos {
 // a small text entry box.
 class CompactNavigationBar : public views::View,
                              public views::ButtonListener,
-                             public AutocompleteEditController,
-                             public BubblePositioner,
                              public CommandUpdater::CommandObserver {
  public:
   explicit CompactNavigationBar(::BrowserView* browser_view);
@@ -40,41 +36,18 @@ class CompactNavigationBar : public views::View,
   // widget.
   void Init();
 
-  // Set focus to the location entry in the compact navigation bar.
-  void FocusLocation();
-
   // views::View overrides.
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
-  virtual void Focus();
 
  private:
   // views::ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
-  // AutocompleteController implementation.
-  virtual void OnAutocompleteAccept(const GURL& url,
-                                    WindowOpenDisposition disposition,
-                                    PageTransition::Type transition,
-                                    const GURL& alternate_nav_url);
-  virtual void OnChanged();
-  virtual void OnInputInProgress(bool in_progress);
-  virtual void OnKillFocus();
-  virtual void OnSetFocus();
-  virtual SkBitmap GetFavIcon() const;
-  virtual std::wstring GetTitle() const;
-
-  // BubblePositioner implementation.
-  virtual gfx::Rect GetLocationStackBounds() const;
-
   // CommandUpdater::CommandObserver implementation.
   virtual void EnabledStateChangedForCommand(int id, bool enabled);
 
-  // Add new tab for the given url. The location of new tab is
-  // controlled by the method |StatusAreaView::GetOpenTabsMode()|.
-  void AddTabWithURL(const GURL& url, PageTransition::Type transition);
-
   ::BrowserView* browser_view_;
 
   bool initialized_;
@@ -83,9 +56,6 @@ class CompactNavigationBar : public views::View,
   views::ImageView* bf_separator_;
   views::ImageButton* forward_;
 
-  scoped_ptr<AutocompleteEditViewGtk> location_entry_;
-  views::NativeViewHost* location_entry_view_;
-
   // History menu for back and forward buttons.
   scoped_ptr<BackForwardMenuModel> back_menu_model_;
   scoped_ptr<BackForwardMenuModel> forward_menu_model_;