| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| deleted file mode 100644
|
| index 442f2e83c1abc8272e9877722f593d6fd6a78de7..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| +++ /dev/null
|
| @@ -1,39 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
|
| -
|
| -#include "ash/ash_switches.h"
|
| -#include "base/command_line.h"
|
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
|
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
|
| -
|
| -// statics
|
| -ChromeLauncherController* ChromeLauncherController::instance_ = NULL;
|
| -
|
| -// static
|
| -ChromeLauncherController* ChromeLauncherController::CreateInstance(
|
| - Profile* profile,
|
| - ash::LauncherModel* model) {
|
| - // We do not check here for re-creation of the ChromeLauncherController since
|
| - // it appears that it might be intentional that the ChromeLauncherController
|
| - // can be re-created.
|
| - if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ash::switches::kAshDisablePerAppLauncher))
|
| - instance_ = new ChromeLauncherControllerPerApp(profile, model);
|
| - else
|
| - instance_ = new ChromeLauncherControllerPerBrowser(profile, model);
|
| - return instance_;
|
| -}
|
| -
|
| -ChromeLauncherController::~ChromeLauncherController() {
|
| - if (instance_ == this)
|
| - instance_ = NULL;
|
| -}
|
| -
|
| -bool ChromeLauncherController::IsPerAppLauncher() {
|
| - if (!instance_)
|
| - return false;
|
| - return instance_->GetPerAppInterface() != NULL;
|
| -}
|
|
|