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

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: Comment fixes to .rc file, and prefixing icon id with IDI_. 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
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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(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::GetChromiumIconPath(), 437 ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconString(),
438 window()->GetNativeWindow()); 438 window()->GetNativeWindow());
439 } 439 }
440 #endif 440 #endif
441 441
442 // Create the extension window controller before sending notifications. 442 // Create the extension window controller before sending notifications.
443 extension_window_controller_.reset( 443 extension_window_controller_.reset(
444 new BrowserExtensionWindowController(this)); 444 new BrowserExtensionWindowController(this));
445 445
446 // TODO(beng): Move BrowserList::AddBrowser() to the end of this function and 446 // TODO(beng): Move BrowserList::AddBrowser() to the end of this function and
447 // replace uses of this with BL's notifications. 447 // replace uses of this with BL's notifications.
(...skipping 1899 matching lines...) Expand 10 before | Expand all | Expand 10 after
2347 if (contents && !allow_js_access) { 2347 if (contents && !allow_js_access) {
2348 contents->web_contents()->GetController().LoadURL( 2348 contents->web_contents()->GetController().LoadURL(
2349 target_url, 2349 target_url,
2350 content::Referrer(), 2350 content::Referrer(),
2351 content::PAGE_TRANSITION_LINK, 2351 content::PAGE_TRANSITION_LINK,
2352 std::string()); // No extra headers. 2352 std::string()); // No extra headers.
2353 } 2353 }
2354 2354
2355 return contents != NULL; 2355 return contents != NULL;
2356 } 2356 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698