| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/views/apps/chrome_native_app_window_views_win.h" | 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h" |
| 6 | 6 |
| 7 #include "apps/app_window.h" | 7 #include "apps/app_window.h" |
| 8 #include "apps/app_window_registry.h" | 8 #include "apps/app_window_registry.h" |
| 9 #include "apps/ui/views/app_window_frame_view.h" | 9 #include "apps/ui/views/app_window_frame_view.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 ShellIntegration::GetAppModelIdForProfile(app_name_wide, | 174 ShellIntegration::GetAppModelIdForProfile(app_name_wide, |
| 175 profile->GetPath()); | 175 profile->GetPath()); |
| 176 ui::win::SetAppIdForWindow(app_model_id_, hwnd); | 176 ui::win::SetAppIdForWindow(app_model_id_, hwnd); |
| 177 | 177 |
| 178 web_app::UpdateShortcutInfoAndIconForApp( | 178 web_app::UpdateShortcutInfoAndIconForApp( |
| 179 extension, | 179 extension, |
| 180 profile, | 180 profile, |
| 181 base::Bind(&ChromeNativeAppWindowViewsWin::OnShortcutInfoLoaded, | 181 base::Bind(&ChromeNativeAppWindowViewsWin::OnShortcutInfoLoaded, |
| 182 weak_ptr_factory_.GetWeakPtr())); | 182 weak_ptr_factory_.GetWeakPtr())); |
| 183 | 183 |
| 184 EnsureCaptionStyleSet(); | 184 if (!create_params.transparent_background) |
| 185 EnsureCaptionStyleSet(); |
| 185 UpdateShelfMenu(); | 186 UpdateShelfMenu(); |
| 186 } | 187 } |
| 187 | 188 |
| 188 views::NonClientFrameView* | 189 views::NonClientFrameView* |
| 189 ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() { | 190 ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() { |
| 190 glass_frame_view_ = NULL; | 191 glass_frame_view_ = NULL; |
| 191 if (ui::win::IsAeroGlassEnabled()) { | 192 if (ui::win::IsAeroGlassEnabled()) { |
| 192 glass_frame_view_ = new GlassAppWindowFrameViewWin(this, widget()); | 193 glass_frame_view_ = new GlassAppWindowFrameViewWin(this, widget()); |
| 193 return glass_frame_view_; | 194 return glass_frame_view_; |
| 194 } | 195 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 link->GetCommandLine()->AppendSwitchASCII(switches::kInstallFromWebstore, | 241 link->GetCommandLine()->AppendSwitchASCII(switches::kInstallFromWebstore, |
| 241 extension->id()); | 242 extension->id()); |
| 242 | 243 |
| 243 ShellLinkItemList items; | 244 ShellLinkItemList items; |
| 244 items.push_back(link); | 245 items.push_back(link); |
| 245 jumplist_updater.AddTasks(items); | 246 jumplist_updater.AddTasks(items); |
| 246 } | 247 } |
| 247 | 248 |
| 248 jumplist_updater.CommitUpdate(); | 249 jumplist_updater.CommitUpdate(); |
| 249 } | 250 } |
| OLD | NEW |