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

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

Issue 2156113002: Replace AppBannerDataFetcher with InstallableManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@banner-refactor
Patch Set: Naming, includes Created 4 years, 4 months 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/banners/app_banner_settings_helper.cc ('k') | chrome/chrome_browser.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 18 matching lines...) Expand all
29 #include "base/threading/thread_task_runner_handle.h" 29 #include "base/threading/thread_task_runner_handle.h"
30 #include "base/time/time.h" 30 #include "base/time/time.h"
31 #include "build/build_config.h" 31 #include "build/build_config.h"
32 #include "chrome/app/chrome_command_ids.h" 32 #include "chrome/app/chrome_command_ids.h"
33 #include "chrome/browser/app_mode/app_mode_utils.h" 33 #include "chrome/browser/app_mode/app_mode_utils.h"
34 #include "chrome/browser/autofill/personal_data_manager_factory.h" 34 #include "chrome/browser/autofill/personal_data_manager_factory.h"
35 #include "chrome/browser/background/background_contents.h" 35 #include "chrome/browser/background/background_contents.h"
36 #include "chrome/browser/background/background_contents_service.h" 36 #include "chrome/browser/background/background_contents_service.h"
37 #include "chrome/browser/background/background_contents_service_factory.h" 37 #include "chrome/browser/background/background_contents_service_factory.h"
38 #include "chrome/browser/banners/app_banner_manager_desktop.h" 38 #include "chrome/browser/banners/app_banner_manager_desktop.h"
39 #include "chrome/browser/banners/app_banner_manager_emulation.h"
40 #include "chrome/browser/browser_process.h" 39 #include "chrome/browser/browser_process.h"
41 #include "chrome/browser/browser_shutdown.h" 40 #include "chrome/browser/browser_shutdown.h"
42 #include "chrome/browser/character_encoding.h" 41 #include "chrome/browser/character_encoding.h"
43 #include "chrome/browser/chrome_notification_types.h" 42 #include "chrome/browser/chrome_notification_types.h"
44 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 43 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
45 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 44 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
46 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 45 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
47 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_re quest.h" 46 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_re quest.h"
48 #include "chrome/browser/defaults.h" 47 #include "chrome/browser/defaults.h"
49 #include "chrome/browser/devtools/devtools_toggle_action.h" 48 #include "chrome/browser/devtools/devtools_toggle_action.h"
(...skipping 1292 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 1341
1343 Browser* browser = chrome::FindBrowserWithWebContents( 1342 Browser* browser = chrome::FindBrowserWithWebContents(
1344 WebContents::FromRenderFrameHost(frame)); 1343 WebContents::FromRenderFrameHost(frame));
1345 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble( 1344 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble(
1346 std::move(chooser_bubble_delegate)); 1345 std::move(chooser_bubble_delegate));
1347 1346
1348 return std::move(bluetooth_chooser_desktop); 1347 return std::move(bluetooth_chooser_desktop);
1349 } 1348 }
1350 1349
1351 void Browser::RequestAppBannerFromDevTools(content::WebContents* web_contents) { 1350 void Browser::RequestAppBannerFromDevTools(content::WebContents* web_contents) {
1352 banners::AppBannerManagerEmulation::CreateForWebContents(web_contents); 1351 banners::AppBannerManagerDesktop::CreateForWebContents(web_contents);
1353 banners::AppBannerManagerEmulation* manager = 1352 banners::AppBannerManagerDesktop* manager =
1354 banners::AppBannerManagerEmulation::FromWebContents(web_contents); 1353 banners::AppBannerManagerDesktop::FromWebContents(web_contents);
1355 manager->RequestAppBanner(web_contents->GetLastCommittedURL(), true); 1354 manager->RequestAppBanner(web_contents->GetLastCommittedURL(), true);
1356 } 1355 }
1357 1356
1358 bool Browser::IsMouseLocked() const { 1357 bool Browser::IsMouseLocked() const {
1359 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); 1358 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked();
1360 } 1359 }
1361 1360
1362 void Browser::OnWindowDidShow() { 1361 void Browser::OnWindowDidShow() {
1363 if (window_has_shown_) 1362 if (window_has_shown_)
1364 return; 1363 return;
(...skipping 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
2602 if (contents && !allow_js_access) { 2601 if (contents && !allow_js_access) {
2603 contents->web_contents()->GetController().LoadURL( 2602 contents->web_contents()->GetController().LoadURL(
2604 target_url, 2603 target_url,
2605 content::Referrer(), 2604 content::Referrer(),
2606 ui::PAGE_TRANSITION_LINK, 2605 ui::PAGE_TRANSITION_LINK,
2607 std::string()); // No extra headers. 2606 std::string()); // No extra headers.
2608 } 2607 }
2609 2608
2610 return contents != NULL; 2609 return contents != NULL;
2611 } 2610 }
OLDNEW
« no previous file with comments | « chrome/browser/banners/app_banner_settings_helper.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698