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

Side by Side Diff: chrome/browser/ui/browser.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 ProfileMetrics::LogProfileLaunch(profile_path); 421 ProfileMetrics::LogProfileLaunch(profile_path);
422 422
423 window_ = params.window ? params.window : CreateBrowserWindow(this); 423 window_ = params.window ? params.window : CreateBrowserWindow(this);
424 424
425 // TODO(beng): move to BrowserFrameWin. 425 // TODO(beng): move to BrowserFrameWin.
426 #if defined(OS_WIN) && !defined(USE_AURA) 426 #if defined(OS_WIN) && !defined(USE_AURA)
427 // Set the app user model id for this application to that of the application 427 // Set the app user model id for this application to that of the application
428 // name. See http://crbug.com/7028. 428 // name. See http://crbug.com/7028.
429 ui::win::SetAppIdForWindow( 429 ui::win::SetAppIdForWindow(
430 is_app() && !is_type_panel() ? 430 is_app() && !is_type_panel() ?
431 ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(app_name_), 431 ShellIntegration::GetAppModelIdForProfile(base::UTF8ToWide(app_name_),
432 profile_->GetPath()) : 432 profile_->GetPath()) :
433 ShellIntegration::GetChromiumModelIdForProfile(profile_->GetPath()), 433 ShellIntegration::GetChromiumModelIdForProfile(profile_->GetPath()),
434 window()->GetNativeWindow()); 434 window()->GetNativeWindow());
435 435
436 if (is_type_panel()) { 436 if (is_type_panel()) {
437 ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconLocation(), 437 ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconLocation(),
438 window()->GetNativeWindow()); 438 window()->GetNativeWindow());
439 } 439 }
440 #endif 440 #endif
441 441
(...skipping 1836 matching lines...) Expand 10 before | Expand all | Expand 10 after
2278 if (contents && !allow_js_access) { 2278 if (contents && !allow_js_access) {
2279 contents->web_contents()->GetController().LoadURL( 2279 contents->web_contents()->GetController().LoadURL(
2280 target_url, 2280 target_url,
2281 content::Referrer(), 2281 content::Referrer(),
2282 content::PAGE_TRANSITION_LINK, 2282 content::PAGE_TRANSITION_LINK,
2283 std::string()); // No extra headers. 2283 std::string()); // No extra headers.
2284 } 2284 }
2285 2285
2286 return contents != NULL; 2286 return contents != NULL;
2287 } 2287 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698