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

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

Issue 64853004: Use high resolution icons where possible for streamlined hosted app icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@browser_experiment_create_app_from_page
Patch Set: remove window icon updating Created 7 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_tab_contents.h" 5 #include "chrome/browser/ui/browser_tab_contents.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
10 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 10 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 40 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
41 #include "chrome/browser/ui/hung_plugin_tab_helper.h" 41 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
42 #include "chrome/browser/ui/passwords/manage_passwords_icon_controller.h" 42 #include "chrome/browser/ui/passwords/manage_passwords_icon_controller.h"
43 #include "chrome/browser/ui/pdf/pdf_tab_helper.h" 43 #include "chrome/browser/ui/pdf/pdf_tab_helper.h"
44 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 44 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
45 #include "chrome/browser/ui/sad_tab_helper.h" 45 #include "chrome/browser/ui/sad_tab_helper.h"
46 #include "chrome/browser/ui/search/search_tab_helper.h" 46 #include "chrome/browser/ui/search/search_tab_helper.h"
47 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" 47 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
48 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" 48 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
49 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 49 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
50 #include "chrome/browser/ui/web_applications/hosted_app_tab_helper.h"
50 #include "chrome/browser/ui/zoom/zoom_controller.h" 51 #include "chrome/browser/ui/zoom/zoom_controller.h"
51 #include "chrome/common/chrome_switches.h" 52 #include "chrome/common/chrome_switches.h"
52 #include "components/autofill/content/browser/autofill_driver_impl.h" 53 #include "components/autofill/content/browser/autofill_driver_impl.h"
53 #include "components/autofill/core/browser/autofill_manager.h" 54 #include "components/autofill/core/browser/autofill_manager.h"
54 #include "components/web_modal/web_contents_modal_dialog_manager.h" 55 #include "components/web_modal/web_contents_modal_dialog_manager.h"
55 #include "content/public/browser/web_contents.h" 56 #include "content/public/browser/web_contents.h"
56 #include "extensions/browser/view_type_utils.h" 57 #include "extensions/browser/view_type_utils.h"
57 58
58 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 59 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
59 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 60 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 std::string(), 198 std::string(),
198 NULL)) { 199 NULL)) {
199 OneClickSigninHelper::CreateForWebContentsWithPasswordManager( 200 OneClickSigninHelper::CreateForWebContentsWithPasswordManager(
200 web_contents, PasswordManager::FromWebContents(web_contents)); 201 web_contents, PasswordManager::FromWebContents(web_contents));
201 } 202 }
202 #endif 203 #endif
203 204
204 #if defined(OS_WIN) 205 #if defined(OS_WIN)
205 MetroPinTabHelper::CreateForWebContents(web_contents); 206 MetroPinTabHelper::CreateForWebContents(web_contents);
206 #endif 207 #endif
208
209 if (CommandLine::ForCurrentProcess()->HasSwitch(
210 switches::kEnableStreamlinedHostedApps))
211 HostedAppTabHelper::CreateForWebContents(web_contents);
207 } 212 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698