OLD | NEW |
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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 377 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
378 IDR_APP_DEFAULT_ICON); | 378 IDR_APP_DEFAULT_ICON); |
379 } | 379 } |
380 | 380 |
381 const gfx::ImageSkia& GetDefaultExtensionIcon() { | 381 const gfx::ImageSkia& GetDefaultExtensionIcon() { |
382 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 382 return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
383 IDR_EXTENSION_DEFAULT_ICON); | 383 IDR_EXTENSION_DEFAULT_ICON); |
384 } | 384 } |
385 | 385 |
386 bool IsNewBookmarkAppsEnabled() { | 386 bool IsNewBookmarkAppsEnabled() { |
| 387 #if defined(OS_CHROMEOS) |
387 return !base::CommandLine::ForCurrentProcess()->HasSwitch( | 388 return !base::CommandLine::ForCurrentProcess()->HasSwitch( |
388 switches::kDisableNewBookmarkApps); | 389 switches::kDisableNewBookmarkApps); |
| 390 #else |
| 391 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 392 switches::kEnableNewBookmarkApps); |
| 393 #endif |
389 } | 394 } |
390 | 395 |
391 } // namespace util | 396 } // namespace util |
392 } // namespace extensions | 397 } // namespace extensions |
OLD | NEW |