Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(867)

Unified Diff: ash/shelf/shelf_widget.h

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.h
diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
index 6c9eeba63e305ea37b99e6e8135a86b49afb078d..d2ff8b43a71d85842358769bc2d7903ce483b46e 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -17,7 +17,7 @@ class Window;
}
namespace ash {
-class Launcher;
+class Shelf;
namespace internal {
class FocusCycler;
@@ -56,22 +56,22 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
internal::ShelfLayoutManager* shelf_layout_manager() {
return shelf_layout_manager_;
}
- Launcher* launcher() const { return launcher_.get(); }
+ Shelf* shelf() const { return shelf_.get(); }
internal::StatusAreaWidget* status_area_widget() const {
return status_area_widget_;
}
- void CreateLauncher();
+ void CreateShelf();
- // Set visibility of the launcher component of the shelf.
- void SetLauncherVisibility(bool visible);
- bool IsLauncherVisible() const;
+ // Set visibility of the shelf.
+ void SetShelfVisibility(bool visible);
+ bool IsShelfVisible() const;
- // Sets the focus cycler. Also adds the launcher to the cycle.
+ // Sets the focus cycler. Also adds the shelf to the cycle.
void SetFocusCycler(internal::FocusCycler* focus_cycler);
internal::FocusCycler* GetFocusCycler();
- // Called by the activation delegate, before the launcher is activated
+ // Called by the activation delegate, before the shelf is activated
// when no other windows are visible.
void WillActivateAsFallback() { activating_as_fallback_ = true; }
@@ -105,7 +105,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
class DelegateView;
internal::ShelfLayoutManager* shelf_layout_manager_;
- scoped_ptr<Launcher> launcher_;
+ scoped_ptr<Shelf> shelf_;
internal::StatusAreaWidget* status_area_widget_;
// delegate_view_ is attached to window_container_ and is cleaned up
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698