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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 12221155: Turning the new launcher back on by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" 9 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser. h" 10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser. h"
11 11
12 // statics 12 // statics
13 ChromeLauncherController* ChromeLauncherController::instance_ = NULL; 13 ChromeLauncherController* ChromeLauncherController::instance_ = NULL;
14 14
15 // static 15 // static
16 ChromeLauncherController* ChromeLauncherController::CreateInstance( 16 ChromeLauncherController* ChromeLauncherController::CreateInstance(
17 Profile* profile, 17 Profile* profile,
18 ash::LauncherModel* model) { 18 ash::LauncherModel* model) {
19 // We do not check here for re-creation of the ChromeLauncherController since 19 // We do not check here for re-creation of the ChromeLauncherController since
20 // it appears that it might be intentional that the ChromeLauncherController 20 // it appears that it might be intentional that the ChromeLauncherController
21 // can be re-created. 21 // can be re-created.
22 if (CommandLine::ForCurrentProcess()->HasSwitch( 22 if (!CommandLine::ForCurrentProcess()->HasSwitch(
23 ash::switches::kAshEnablePerAppLauncher)) 23 ash::switches::kAshDisablePerAppLauncher))
24 instance_ = new ChromeLauncherControllerPerApp(profile, model); 24 instance_ = new ChromeLauncherControllerPerApp(profile, model);
25 else 25 else
26 instance_ = new ChromeLauncherControllerPerBrowser(profile, model); 26 instance_ = new ChromeLauncherControllerPerBrowser(profile, model);
27 return instance_; 27 return instance_;
28 } 28 }
29 29
30 ChromeLauncherController::~ChromeLauncherController() { 30 ChromeLauncherController::~ChromeLauncherController() {
31 if (instance_ == this) 31 if (instance_ == this)
32 instance_ = NULL; 32 instance_ = NULL;
33 } 33 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698