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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/startup/startup_browser_creator_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_restore_service.h" 10 #include "apps/app_restore_service.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 if (shortcut.find(L"\\Quick Launch\\") != string16::npos) { 143 if (shortcut.find(L"\\Quick Launch\\") != string16::npos) {
144 if (base::win::GetVersion() >= base::win::VERSION_WIN7) 144 if (base::win::GetVersion() >= base::win::VERSION_WIN7)
145 return LM_SHORTCUT_TASKBAR; 145 return LM_SHORTCUT_TASKBAR;
146 else 146 else
147 return LM_SHORTCUT_QUICKLAUNCH; 147 return LM_SHORTCUT_QUICKLAUNCH;
148 } 148 }
149 scoped_ptr<base::Environment> env(base::Environment::Create()); 149 scoped_ptr<base::Environment> env(base::Environment::Create());
150 std::string appdata_path; 150 std::string appdata_path;
151 env->GetVar("USERPROFILE", &appdata_path); 151 env->GetVar("USERPROFILE", &appdata_path);
152 if (!appdata_path.empty() && 152 if (!appdata_path.empty() &&
153 shortcut.find(ASCIIToWide(appdata_path)) != std::wstring::npos) 153 shortcut.find(base::ASCIIToWide(appdata_path)) != std::wstring::npos)
154 return LM_SHORTCUT_DESKTOP; 154 return LM_SHORTCUT_DESKTOP;
155 return LM_SHORTCUT_UNKNOWN; 155 return LM_SHORTCUT_UNKNOWN;
156 } 156 }
157 return LM_SHORTCUT_NONE; 157 return LM_SHORTCUT_NONE;
158 } 158 }
159 #else 159 #else
160 // TODO(cpu): Port to other platforms. 160 // TODO(cpu): Port to other platforms.
161 LaunchMode GetLaunchShortcutKind() { 161 LaunchMode GetLaunchShortcutKind() {
162 return LM_LINUX_MAC_BEOS; 162 return LM_LINUX_MAC_BEOS;
163 } 163 }
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 } 943 }
944 944
945 #if !defined(OS_WIN) || defined(USE_AURA) 945 #if !defined(OS_WIN) || defined(USE_AURA)
946 // static 946 // static
947 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( 947 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
948 Profile* profile, 948 Profile* profile,
949 const std::vector<GURL>& startup_urls) { 949 const std::vector<GURL>& startup_urls) {
950 return false; 950 return false;
951 } 951 }
952 #endif 952 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_view_browsertest.cc ('k') | chrome/browser/ui/views/about_ipc_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698