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

Side by Side Diff: chrome/browser/app_controller_mac.mm

Issue 109013006: 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: fix 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 #import "chrome/browser/app_controller_mac.h" 5 #import "chrome/browser/app_controller_mac.h"
6 6
7 #include "apps/app_shim/app_shim_mac.h" 7 #include "apps/app_shim/app_shim_mac.h"
8 #include "apps/app_shim/extension_app_shim_handler_mac.h" 8 #include "apps/app_shim/extension_app_shim_handler_mac.h"
9 #include "apps/shell_window_registry.h" 9 #include "apps/shell_window_registry.h"
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 NSString* menuStr = 1420 NSString* menuStr =
1421 l10n_util::GetNSStringWithFixup(IDS_BACKGROUND_APPS_MAC); 1421 l10n_util::GetNSStringWithFixup(IDS_BACKGROUND_APPS_MAC);
1422 base::scoped_nsobject<NSMenu> appMenu( 1422 base::scoped_nsobject<NSMenu> appMenu(
1423 [[NSMenu alloc] initWithTitle:menuStr]); 1423 [[NSMenu alloc] initWithTitle:menuStr]);
1424 for (extensions::ExtensionList::const_iterator cursor = 1424 for (extensions::ExtensionList::const_iterator cursor =
1425 applications.begin(); 1425 applications.begin();
1426 cursor != applications.end(); 1426 cursor != applications.end();
1427 ++cursor, ++position) { 1427 ++cursor, ++position) {
1428 DCHECK_EQ(applications.GetPosition(cursor->get()), position); 1428 DCHECK_EQ(applications.GetPosition(cursor->get()), position);
1429 NSString* itemStr = 1429 NSString* itemStr =
1430 base::SysUTF16ToNSString(UTF8ToUTF16((*cursor)->name())); 1430 base::SysUTF16ToNSString(base::UTF8ToUTF16((*cursor)->name()));
1431 base::scoped_nsobject<NSMenuItem> appItem( 1431 base::scoped_nsobject<NSMenuItem> appItem(
1432 [[NSMenuItem alloc] initWithTitle:itemStr 1432 [[NSMenuItem alloc] initWithTitle:itemStr
1433 action:@selector(executeApplication:) 1433 action:@selector(executeApplication:)
1434 keyEquivalent:@""]); 1434 keyEquivalent:@""]);
1435 [appItem setTarget:self]; 1435 [appItem setTarget:self];
1436 [appItem setTag:position]; 1436 [appItem setTag:position];
1437 [appMenu addItem:appItem]; 1437 [appMenu addItem:appItem];
1438 } 1438 }
1439 } 1439 }
1440 } 1440 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 1483
1484 //--------------------------------------------------------------------------- 1484 //---------------------------------------------------------------------------
1485 1485
1486 namespace app_controller_mac { 1486 namespace app_controller_mac {
1487 1487
1488 bool IsOpeningNewWindow() { 1488 bool IsOpeningNewWindow() {
1489 return g_is_opening_new_window; 1489 return g_is_opening_new_window;
1490 } 1490 }
1491 1491
1492 } // namespace app_controller_mac 1492 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « chrome/browser/android/provider/chrome_browser_provider.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698