Compact Navigation prototype

chrome/browser/ui/views/toolbar_view.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 117 matching lines @@
   virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
   virtual void OnThemeChanged() OVERRIDE;
 
   // The apparent horizontal space between most items, and the vertical padding
   // above and below them.
   static const int kStandardSpacing;
   // The top of the toolbar has an edge we have to skip over in addition to the
   // standard spacing.
   static const int kVertSpacing;
 
+  // Gets a bitmap with the icon for the app menu and any overlaid notification
+  // badge.
+  SkBitmap GetAppMenuIcon(views::CustomButton::ButtonState state);

[sky, 2011/05/03 18:38:32]

Move implementation to match new position in header.

[SteveT, 2011/05/06 18:48:43]

Done in .cc. Also moved this declaration up in the headers to join the publics.

+
  protected:
 
   // Overridden from AccessiblePaneView
   virtual views::View* GetDefaultFocusableChild() OVERRIDE;
   virtual void RemovePaneFocus() OVERRIDE;
 
  private:
   // Returns true if we should show the upgrade recommended dot.
   bool IsUpgradeRecommended();
 
@@ skipping 15 matching lines @@
     DISPLAYMODE_LOCATION      // Slimline toolbar showing only compact location
                               // bar, used for popups.
   };
   bool IsDisplayModeNormal() const {
     return display_mode_ == DISPLAYMODE_NORMAL;
   }
 
   // Updates the badge on the app menu (Wrench).
   void UpdateAppMenuBadge();
 
-  // Gets a bitmap with the icon for the app menu and any overlaid notification
-  // badge.
-  SkBitmap GetAppMenuIcon(views::CustomButton::ButtonState state);
-
   // Gets a badge for the wrench icon corresponding to the number of
   // unacknowledged background pages in the system.
   SkBitmap GetBackgroundPageBadge();
 
   scoped_ptr<BackForwardMenuModel> back_menu_model_;
   scoped_ptr<BackForwardMenuModel> forward_menu_model_;
 
   // The model that contains the security level, text, icon to display...
   ToolbarModel* model_;
 
@@ skipping 39 matching lines @@
 
   // If non-null the destructor sets this to true. This is set to a non-null
   // while the menu is showing and used to detect if the menu was deleted while
   // running.
   bool* destroyed_flag_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_