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

Side by Side Diff: chrome/browser/extensions/extension_util.cc

Issue 772533005: Enable the new bookmark apps system by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update one more test Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/extension_util.h" 5 #include "chrome/browser/extensions/extension_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 353 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
354 IDR_APP_DEFAULT_ICON); 354 IDR_APP_DEFAULT_ICON);
355 } 355 }
356 356
357 const gfx::ImageSkia& GetDefaultExtensionIcon() { 357 const gfx::ImageSkia& GetDefaultExtensionIcon() {
358 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 358 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
359 IDR_EXTENSION_DEFAULT_ICON); 359 IDR_EXTENSION_DEFAULT_ICON);
360 } 360 }
361 361
362 bool IsStreamlinedHostedAppsEnabled() { 362 bool IsStreamlinedHostedAppsEnabled() {
363 return CommandLine::ForCurrentProcess()->HasSwitch( 363 return !CommandLine::ForCurrentProcess()->HasSwitch(
364 switches::kEnableStreamlinedHostedApps); 364 switches::kDisableNewBookmarkApps);
365 } 365 }
366 366
367 } // namespace util 367 } // namespace util
368 } // namespace extensions 368 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698