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

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

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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/launcher_item_controller.h" 5 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 18 matching lines...) Expand all
29 const std::string& LauncherItemController::app_id() const { 29 const std::string& LauncherItemController::app_id() const {
30 return app_id_; 30 return app_id_;
31 } 31 }
32 32
33 base::string16 LauncherItemController::GetAppTitle() const { 33 base::string16 LauncherItemController::GetAppTitle() const {
34 if (app_id_.empty()) 34 if (app_id_.empty())
35 return base::string16(); 35 return base::string16();
36 const extensions::Extension* extension = 36 const extensions::Extension* extension =
37 launcher_controller_->profile()->GetExtensionService()-> 37 launcher_controller_->profile()->GetExtensionService()->
38 GetInstalledExtension(app_id_); 38 GetInstalledExtension(app_id_);
39 return extension ? UTF8ToUTF16(extension->name()) : base::string16(); 39 return extension ? base::UTF8ToUTF16(extension->name()) : base::string16();
40 } 40 }
41 41
42 ash::LauncherItemType LauncherItemController::GetLauncherItemType() const { 42 ash::LauncherItemType LauncherItemController::GetLauncherItemType() const {
43 switch (type_) { 43 switch (type_) {
44 case LauncherItemController::TYPE_SHORTCUT: 44 case LauncherItemController::TYPE_SHORTCUT:
45 case LauncherItemController::TYPE_WINDOWED_APP: 45 case LauncherItemController::TYPE_WINDOWED_APP:
46 return ash::TYPE_APP_SHORTCUT; 46 return ash::TYPE_APP_SHORTCUT;
47 case LauncherItemController::TYPE_APP: 47 case LauncherItemController::TYPE_APP:
48 return ash::TYPE_PLATFORM_APP; 48 return ash::TYPE_PLATFORM_APP;
49 case LauncherItemController::TYPE_APP_PANEL: 49 case LauncherItemController::TYPE_APP_PANEL:
50 return ash::TYPE_APP_PANEL; 50 return ash::TYPE_APP_PANEL;
51 } 51 }
52 NOTREACHED(); 52 NOTREACHED();
53 return ash::TYPE_APP_SHORTCUT; 53 return ash::TYPE_APP_SHORTCUT;
54 } 54 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc ('k') | chrome/browser/ui/ash/screenshot_taker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698