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

Side by Side Diff: chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h

Issue 9835081: Change the launcher to create new tabs instead of windows when (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // launcher, the running instance is pinned. If there is no running instance, 137 // launcher, the running instance is pinned. If there is no running instance,
138 // a new launcher item is created with |app_type| and pinned. 138 // a new launcher item is created with |app_type| and pinned.
139 void PinAppWithID(const std::string& app_id, AppType app_type); 139 void PinAppWithID(const std::string& app_id, AppType app_type);
140 140
141 // Unpins any app items whose id is |app_id|. 141 // Unpins any app items whose id is |app_id|.
142 void UnpinAppsWithID(const std::string& app_id); 142 void UnpinAppsWithID(const std::string& app_id);
143 143
144 ash::LauncherModel* model() { return model_; } 144 ash::LauncherModel* model() { return model_; }
145 145
146 // ash::LauncherDelegate overrides: 146 // ash::LauncherDelegate overrides:
147 virtual void CreateNewWindow() OVERRIDE; 147 virtual void CreateNewTab() OVERRIDE;
148 virtual void ItemClicked(const ash::LauncherItem& item) OVERRIDE; 148 virtual void ItemClicked(const ash::LauncherItem& item) OVERRIDE;
149 virtual int GetBrowserShortcutResourceId() OVERRIDE; 149 virtual int GetBrowserShortcutResourceId() OVERRIDE;
150 virtual string16 GetTitle(const ash::LauncherItem& item) OVERRIDE; 150 virtual string16 GetTitle(const ash::LauncherItem& item) OVERRIDE;
151 virtual ui::MenuModel* CreateContextMenu( 151 virtual ui::MenuModel* CreateContextMenu(
152 const ash::LauncherItem& item) OVERRIDE; 152 const ash::LauncherItem& item) OVERRIDE;
153 virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE; 153 virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE;
154 154
155 // ash::LauncherModelObserver overrides: 155 // ash::LauncherModelObserver overrides:
156 virtual void LauncherItemAdded(int index) OVERRIDE; 156 virtual void LauncherItemAdded(int index) OVERRIDE;
157 virtual void LauncherItemRemoved(int index, ash::LauncherID id) OVERRIDE; 157 virtual void LauncherItemRemoved(int index, ash::LauncherID id) OVERRIDE;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 // Used to load the image for an app tab. 220 // Used to load the image for an app tab.
221 scoped_ptr<AppIconLoader> app_icon_loader_; 221 scoped_ptr<AppIconLoader> app_icon_loader_;
222 222
223 content::NotificationRegistrar registrar_; 223 content::NotificationRegistrar registrar_;
224 224
225 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherDelegate); 225 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherDelegate);
226 }; 226 };
227 227
228 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_ 228 #endif // CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_CHROME_LAUNCHER_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell/launcher_delegate_impl.cc ('k') | chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698