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

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

Issue 11359133: Add default icon to app_host.exe, and use it in shortcuts during installation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Renaming GetChromiumIconString() => GetChromiumIconLocation(). Created 8 years, 1 month 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
« no previous file with comments | « chrome/browser/shell_integration_win.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 // Set the app user model id for this application to that of the application 434 // Set the app user model id for this application to that of the application
435 // name. See http://crbug.com/7028. 435 // name. See http://crbug.com/7028.
436 ui::win::SetAppIdForWindow( 436 ui::win::SetAppIdForWindow(
437 is_app() && !is_type_panel() ? 437 is_app() && !is_type_panel() ?
438 ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(app_name_), 438 ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(app_name_),
439 profile_->GetPath()) : 439 profile_->GetPath()) :
440 ShellIntegration::GetChromiumModelIdForProfile(profile_->GetPath()), 440 ShellIntegration::GetChromiumModelIdForProfile(profile_->GetPath()),
441 window()->GetNativeWindow()); 441 window()->GetNativeWindow());
442 442
443 if (is_type_panel()) { 443 if (is_type_panel()) {
444 ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconPath(), 444 ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconLocation(),
445 window()->GetNativeWindow()); 445 window()->GetNativeWindow());
446 } 446 }
447 #endif 447 #endif
448 448
449 // Create the extension window controller before sending notifications. 449 // Create the extension window controller before sending notifications.
450 extension_window_controller_.reset( 450 extension_window_controller_.reset(
451 new BrowserExtensionWindowController(this)); 451 new BrowserExtensionWindowController(this));
452 452
453 // TODO(beng): Move BrowserList::AddBrowser() to the end of this function and 453 // TODO(beng): Move BrowserList::AddBrowser() to the end of this function and
454 // replace uses of this with BL's notifications. 454 // replace uses of this with BL's notifications.
(...skipping 1893 matching lines...) Expand 10 before | Expand all | Expand 10 after
2348 if (contents && !allow_js_access) { 2348 if (contents && !allow_js_access) {
2349 contents->web_contents()->GetController().LoadURL( 2349 contents->web_contents()->GetController().LoadURL(
2350 target_url, 2350 target_url,
2351 content::Referrer(), 2351 content::Referrer(),
2352 content::PAGE_TRANSITION_LINK, 2352 content::PAGE_TRANSITION_LINK,
2353 std::string()); // No extra headers. 2353 std::string()); // No extra headers.
2354 } 2354 }
2355 2355
2356 return contents != NULL; 2356 return contents != NULL;
2357 } 2357 }
OLDNEW
« no previous file with comments | « chrome/browser/shell_integration_win.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698