views: Cleanup BrowserView function order and variable names

chrome/browser/ui/views/frame/browser_view.h

 // Copyright (c) 2012 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_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 154 matching lines @@
   // Accessor for the InfobarContainer.
   InfoBarContainerView* infobar_container() { return infobar_container_; }
 
   // Returns true if various window components are visible.
   bool IsTabStripVisible() const;
 
   // Returns true if the profile associated with this Browser window is
   // incognito.
   bool IsOffTheRecord() const;
 
+  // Returns the resource ID to use for the OTR icon, which depends on
+  // which layout is being shown and whether we are full-screen.
+  int GetOTRIconResourceID() const;
+
   // Returns true if the profile associated with this Browser window is
   // a guest session.
   bool IsGuestSession() const;
 
   // Returns true if the non-client view should render an avatar icon.
-  virtual bool ShouldShowAvatar() const;
-
-  // Handle the specified |accelerator| being pressed.
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
+  bool ShouldShowAvatar() const;
 
   // Provides the containing frame with the accelerator for the specified
   // command id. This can be used to provide menu item shortcut hints etc.
   // Returns true if an accelerator was found for the specified |cmd_id|, false
   // otherwise.
   bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
 
   // Returns true if the specificed |accelerator| is registered with this view.
   bool IsAcceleratorRegistered(const ui::Accelerator& accelerator);
 
@@ skipping 223 matching lines @@
   virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE;
   virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE;
   virtual bool DrawInfoBarArrows(int* x) const OVERRIDE;
 
   // views::SingleSplitViewListener overrides:
   virtual bool SplitHandleMoved(views::SingleSplitView* sender) OVERRIDE;
 
   // gfx::SysColorChangeListener overrides:
   virtual void OnSysColorChange() OVERRIDE;
 
-  // Returns the resource ID to use for the OTR icon, which depends on
-  // which layout is being shown and whether we are full-screen.
-  int GetOTRIconResourceID() const;
-
   // Overridden from views::View:
   virtual std::string GetClassName() const OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
+  // Overridden from ui::AcceleratorTarget:
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
+
+  // Testing interface:
   views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; }
-  // TODO(jamescook): Rename |contents_| and |contents_container_|.
-  ContentsContainer* GetContentsContainerForTest() { return contents_; }
-  views::WebView* GetContentsWebViewForTest() { return contents_container_; }
-
- protected:
-  // Appends to |toolbars| a pointer to each AccessiblePaneView that
-  // can be traversed using F6, in the order they should be traversed.
-  // Abstracted here so that it can be extended for Chrome OS.
-  void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes);
-
-  // Browser window related initializations.
-  void Init();
-
-  // Callback for the loading animation(s) associated with this view.
-  void LoadingAnimationCallback();
-
-  // LoadCompleteListener::Delegate implementation. Creates and initializes the
-  // |jumplist_| after the first page load.
-  virtual void OnLoadCompleted() OVERRIDE;
+  ContentsContainer* GetContentsContainerForTest() {
+    return contents_container_;
+  }
+  views::WebView* GetContentsWebViewForTest() { return contents_web_view_; }
 
  private:
   friend class BrowserViewLayout;
   FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest,
                            TestAboutChromeViewAccObj);
 
   enum FullscreenType {
     FOR_DESKTOP,
     FOR_METRO
   };
 
   // We store this on linux because we must call ProcessFullscreen()
   // asynchronously from FullScreenStateChanged() instead of directly from
   // EnterFullscreen().
   struct PendingFullscreenRequest {
     PendingFullscreenRequest()
         : pending(false),
           bubble_type(FEB_TYPE_NONE) {}
 
     bool pending;
     GURL url;
     FullscreenExitBubbleType bubble_type;
   };
 
+  // Appends to |toolbars| a pointer to each AccessiblePaneView that
+  // can be traversed using F6, in the order they should be traversed.
+  void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes);
+
+  // Browser window related initializations.
+  void Init();
+
+  // Callback for the loading animation(s) associated with this view.
+  void LoadingAnimationCallback();
+
+  // LoadCompleteListener::Delegate implementation. Creates and initializes the
+  // |jumplist_| after the first page load.
+  virtual void OnLoadCompleted() OVERRIDE;
+
   // Returns the BrowserViewLayout.
   BrowserViewLayout* GetBrowserViewLayout() const;
 
   // Layout the Status Bubble.
   void LayoutStatusBubble();
 
   // Prepare to show the Bookmark Bar for the specified WebContents.
   // Returns true if the Bookmark Bar can be shown (i.e. it's supported for this
   // Browser type) and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
@@ skipping 107 matching lines @@
   // |  |------------------------------------------------------------|  |
   // |  | Navigation buttons, address bar, menu (toolbar_)           |  |
   // |  --------------------------------------------------------------  |
   // |------------------------------------------------------------------|
   // | All infobars (infobar_container_) [1]                            |
   // |------------------------------------------------------------------|
   // | Bookmarks (bookmark_bar_view_) [1]                               |
   // |------------------------------------------------------------------|
   // | Debugger splitter (contents_split_)                              |
   // |  --------------------------------------------------------------  |
-  // |  | Page content (contents_)                                   |  |
+  // |  | Page content (contents_container_)                         |  |
   // |  |  --------------------------------------------------------  |  |
-  // |  |  | contents_container_ and/or                           |  |  |
-  // |  |  | overlay_controller_->overlay_container_              |  |  |
+  // |  |  | contents_web_view_ and/or                            |  |  |
+  // |  |  | overlay_controller_->overlay_                        |  |  |
   // |  |  |                                                      |  |  |
   // |  |  |                                                      |  |  |
   // |  |  --------------------------------------------------------  |  |
   // |  --------------------------------------------------------------  |
   // |  --------------------------------------------------------------  |
   // |  | Debugger (devtools_container_)                             |  |
   // |  |                                                            |  |
   // |  --------------------------------------------------------------  |
   // |------------------------------------------------------------------|
   // | Active downloads (download_shelf_)                               |
   // --------------------------------------------------------------------
   //
   // [1] The bookmark bar and info bar are swapped when on the new tab page.
-  //     Additionally contents_ is positioned on top of the bookmark bar when
-  //     the bookmark bar is detached. This is done to allow the
-  //     overlay_controller_->overlay_container_ to appear over the bookmark
-  //     bar.
+  //     Additionally contents_container_ is positioned on top of the bookmark
+  //     bar when the bookmark bar is detached. This is done to allow the
+  //     overlay_controller_->overlay_ to appear over the bookmark bar.
 
   // The view that manages the tab strip, toolbar, and sometimes the bookmark
   // bar. Stacked in the top of the view hiearachy so it can be used to
   // slide out the top views in immersive fullscreen.
   TopContainerView* top_container_;
 
   // The TabStrip.
   TabStrip* tabstrip_;
 
   // The Toolbar containing the navigation buttons, menus and the address bar.
   ToolbarView* toolbar_;
 
   // This button sits next to the tabs on the right hand side and it is used
   // only in windows metro metro mode to allow the user to flip among browser
   // windows.
   views::Button* window_switcher_button_;
 
   // The Bookmark Bar View for this window. Lazily created. May be NULL for
   // non-tabbed browsers like popups. May not be visible.
   scoped_ptr<BookmarkBarView> bookmark_bar_view_;
 
   // The download shelf view (view at the bottom of the page).
   scoped_ptr<DownloadShelfView> download_shelf_;
 
   // The InfoBarContainerView that contains InfoBars for the current tab.
   InfoBarContainerView* infobar_container_;
 
   // The view that contains the selected WebContents.
-  // TODO(jamescook): Rename this to |contents_web_view_| in order to
-  // reduce confusion with ContentsContainer |contents_| below.
-  views::WebView* contents_container_;
+  views::WebView* contents_web_view_;
 
   // The view that contains devtools window for the selected WebContents.
   views::WebView* devtools_container_;
 
-  // The view managing both the contents_container_ and
-  // overlay_controller_->overlay_container_.
-  ContentsContainer* contents_;
+  // The view managing both the |contents_web_view_| and
+  // |overlay_controller_->overlay_|.
+  ContentsContainer* contents_container_;
 
   // Split view containing the contents container and devtools container.
   views::SingleSplitView* contents_split_;
 
   // Side to dock devtools to.
   DevToolsDockSide devtools_dock_side_;
 
   // Docked devtools window instance. NULL when current tab is not inspected
   // or is inspected with undocked version of DevToolsWindow.
   DevToolsWindow* devtools_window_;
@@ skipping 65 matching lines @@
   gfx::ScopedSysColorChangeListener color_change_listener_;
 
   scoped_ptr<InstantOverlayControllerViews> overlay_controller_;
 
   mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_