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

Unified Diff: ash/shell/app_list.cc

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
Index: ash/shell/app_list.cc
===================================================================
--- ash/shell/app_list.cc (revision 115744)
+++ ash/shell/app_list.cc (working copy)
@@ -18,7 +18,7 @@
namespace {
-class WindowTypeLauncherItem : public aura_shell::AppListItemModel {
+class WindowTypeLauncherItem : public ash::AppListItemModel {
public:
enum Type {
TOPLEVEL_WINDOW = 0,
@@ -45,8 +45,8 @@
SkBitmap icon;
icon.setConfig(SkBitmap::kARGB_8888_Config,
- aura_shell::AppListItemView::kIconSize,
- aura_shell::AppListItemView::kIconSize);
+ ash::AppListItemView::kIconSize,
+ ash::AppListItemView::kIconSize);
icon.allocPixels();
icon.eraseColor(kColors[static_cast<int>(type) % arraysize(kColors)]);
return icon;
@@ -104,12 +104,12 @@
DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncherItem);
};
-class ExampleAppListViewDelegate : public aura_shell::AppListViewDelegate {
+class ExampleAppListViewDelegate : public ash::AppListViewDelegate {
public:
ExampleAppListViewDelegate() {}
private:
- virtual void OnAppListItemActivated(aura_shell::AppListItemModel* item,
+ virtual void OnAppListItemActivated(ash::AppListItemModel* item,
int event_flags) OVERRIDE {
static_cast<WindowTypeLauncherItem*>(item)->Activate(event_flags);
}
@@ -117,12 +117,12 @@
DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
};
-aura_shell::AppListItemGroupModel* CreateGroup(
+ash::AppListItemGroupModel* CreateGroup(
const std::string& title,
WindowTypeLauncherItem::Type start_type,
WindowTypeLauncherItem::Type end_type) {
- aura_shell::AppListItemGroupModel* group =
- new aura_shell::AppListItemGroupModel(title);
+ ash::AppListItemGroupModel* group =
+ new ash::AppListItemGroupModel(title);
for (int i = static_cast<int>(start_type);
i < static_cast<int>(end_type);
++i) {
@@ -135,7 +135,7 @@
} // namespace
-void BuildAppListModel(aura_shell::AppListModel* model) {
+void BuildAppListModel(ash::AppListModel* model) {
model->AddGroup(CreateGroup("Windows",
WindowTypeLauncherItem::TOPLEVEL_WINDOW,
WindowTypeLauncherItem::WIDGETS_WINDOW));
@@ -144,18 +144,18 @@
WindowTypeLauncherItem::LAST_TYPE));
}
-aura_shell::AppListViewDelegate* CreateAppListViewDelegate() {
+ash::AppListViewDelegate* CreateAppListViewDelegate() {
return new ExampleAppListViewDelegate;
}
// TODO(xiyuan): Remove this.
void CreateAppList(
const gfx::Rect& bounds,
- const aura_shell::ShellDelegate::SetWidgetCallback& callback) {
- aura_shell::AppListModel* model = new aura_shell::AppListModel;
+ const ash::ShellDelegate::SetWidgetCallback& callback) {
+ ash::AppListModel* model = new ash::AppListModel;
BuildAppListModel(model);
- new aura_shell::AppListView(
+ new ash::AppListView(
model,
CreateAppListViewDelegate(),
bounds,

Powered by Google App Engine
This is Rietveld 408576698