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

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

Issue 14328031: Adding a minimize function for clicks on launcher items if only a single item (already active) is a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added one unit test and addressed comments Created 7 years, 8 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_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/extensions/extension_prefs.h" 23 #include "chrome/browser/extensions/extension_prefs.h"
24 #include "chrome/browser/prefs/pref_service_syncable_observer.h" 24 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
25 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" 25 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
26 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 26 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
27 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" 27 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
28 #include "content/public/browser/notification_observer.h" 28 #include "content/public/browser/notification_observer.h"
29 #include "content/public/browser/notification_registrar.h" 29 #include "content/public/browser/notification_registrar.h"
30 #include "ui/aura/window_observer.h" 30 #include "ui/aura/window_observer.h"
31 31
32 class AppSyncUIState; 32 class AppSyncUIState;
33 class BaseWindow;
33 class Browser; 34 class Browser;
34 class BrowserLauncherItemControllerTest; 35 class BrowserLauncherItemControllerTest;
35 class ExtensionEnableFlow; 36 class ExtensionEnableFlow;
36 class LauncherItemController; 37 class LauncherItemController;
37 class Profile; 38 class Profile;
38 class ShellWindowLauncherController; 39 class ShellWindowLauncherController;
39 40
40 namespace ash { 41 namespace ash {
41 class LauncherModel; 42 class LauncherModel;
42 } 43 }
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 AppState app_state) OVERRIDE; 235 AppState app_state) OVERRIDE;
235 236
236 // Limits application refocusing to urls that match |url| for |id|. 237 // Limits application refocusing to urls that match |url| for |id|.
237 virtual void SetRefocusURLPatternForTest(ash::LauncherID id, 238 virtual void SetRefocusURLPatternForTest(ash::LauncherID id,
238 const GURL& url) OVERRIDE; 239 const GURL& url) OVERRIDE;
239 240
240 // Returns the extension identified by |app_id|. 241 // Returns the extension identified by |app_id|.
241 virtual const extensions::Extension* GetExtensionForAppID( 242 virtual const extensions::Extension* GetExtensionForAppID(
242 const std::string& app_id) const OVERRIDE; 243 const std::string& app_id) const OVERRIDE;
243 244
245 // Activates a |window|. If |allow_minimize| is true and the system allows
246 // it, the the window will get minimized instead.
247 virtual void ActivateWindowOrMinimizeIfActive(BaseWindow* window,
248 bool allow_minimize) OVERRIDE;
249
244 // ash::LauncherDelegate overrides: 250 // ash::LauncherDelegate overrides:
245 virtual void OnBrowserShortcutClicked(int event_flags) OVERRIDE; 251 virtual void OnBrowserShortcutClicked(int event_flags) OVERRIDE;
246 virtual void ItemClicked(const ash::LauncherItem& item, 252 virtual void ItemClicked(const ash::LauncherItem& item,
247 const ui::Event& event) OVERRIDE; 253 const ui::Event& event) OVERRIDE;
248 virtual int GetBrowserShortcutResourceId() OVERRIDE; 254 virtual int GetBrowserShortcutResourceId() OVERRIDE;
249 virtual string16 GetTitle(const ash::LauncherItem& item) OVERRIDE; 255 virtual string16 GetTitle(const ash::LauncherItem& item) OVERRIDE;
250 virtual ui::MenuModel* CreateContextMenu( 256 virtual ui::MenuModel* CreateContextMenu(
251 const ash::LauncherItem& item, aura::RootWindow* root) OVERRIDE; 257 const ash::LauncherItem& item, aura::RootWindow* root) OVERRIDE;
252 virtual ash::LauncherMenuModel* CreateApplicationMenu( 258 virtual ash::LauncherMenuModel* CreateApplicationMenu(
253 const ash::LauncherItem& item, 259 const ash::LauncherItem& item,
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 399
394 scoped_ptr<ExtensionEnableFlow> extension_enable_flow_; 400 scoped_ptr<ExtensionEnableFlow> extension_enable_flow_;
395 401
396 // Launchers that are currently being observed. 402 // Launchers that are currently being observed.
397 std::set<ash::Launcher*> launchers_; 403 std::set<ash::Launcher*> launchers_;
398 404
399 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser); 405 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerBrowser);
400 }; 406 };
401 407
402 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_ 408 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_BROWSER _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698