OLD | NEW |
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 // OS_WIN | 10 #endif // OS_WIN |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 DCHECK(!window_); | 527 DCHECK(!window_); |
528 | 528 |
529 window_ = CreateBrowserWindow(); | 529 window_ = CreateBrowserWindow(); |
530 fullscreen_controller_ = new FullscreenController(window_, profile_, this); | 530 fullscreen_controller_ = new FullscreenController(window_, profile_, this); |
531 | 531 |
532 #if defined(OS_WIN) && !defined(USE_AURA) | 532 #if defined(OS_WIN) && !defined(USE_AURA) |
533 // Set the app user model id for this application to that of the application | 533 // Set the app user model id for this application to that of the application |
534 // name. See http://crbug.com/7028. | 534 // name. See http://crbug.com/7028. |
535 ui::win::SetAppIdForWindow( | 535 ui::win::SetAppIdForWindow( |
536 is_app() && !is_type_panel() ? | 536 is_app() && !is_type_panel() ? |
537 ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) : | 537 ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(app_name_), |
538 ShellIntegration::GetChromiumAppId(profile_->GetPath()), | 538 profile_->GetPath()) : |
| 539 ShellIntegration::GetChromiumModelIdForProfile(profile_->GetPath()), |
539 window()->GetNativeWindow()); | 540 window()->GetNativeWindow()); |
540 | 541 |
541 if (is_type_panel()) { | 542 if (is_type_panel()) { |
542 ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconPath(), | 543 ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconPath(), |
543 window()->GetNativeWindow()); | 544 window()->GetNativeWindow()); |
544 } | 545 } |
545 #endif | 546 #endif |
546 | 547 |
547 // Create the extension window controller before sending notifications. | 548 // Create the extension window controller before sending notifications. |
548 extension_window_controller_.reset( | 549 extension_window_controller_.reset( |
(...skipping 4676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5225 if (contents && !allow_js_access) { | 5226 if (contents && !allow_js_access) { |
5226 contents->web_contents()->GetController().LoadURL( | 5227 contents->web_contents()->GetController().LoadURL( |
5227 target_url, | 5228 target_url, |
5228 content::Referrer(), | 5229 content::Referrer(), |
5229 content::PAGE_TRANSITION_LINK, | 5230 content::PAGE_TRANSITION_LINK, |
5230 std::string()); // No extra headers. | 5231 std::string()); // No extra headers. |
5231 } | 5232 } |
5232 | 5233 |
5233 return contents != NULL; | 5234 return contents != NULL; |
5234 } | 5235 } |
OLD | NEW |