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

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

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 years, 9 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
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/exclusive_access/fullscreen_controller.h" 5 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
11 #include "base/metrics/user_metrics.h"
11 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
12 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "chrome/browser/app_mode/app_mode_utils.h" 15 #include "chrome/browser/app_mode/app_mode_utils.h"
15 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 17 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
17 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" 19 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
19 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" 20 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
20 #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h" 21 #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h"
21 #include "chrome/browser/ui/status_bubble.h" 22 #include "chrome/browser/ui/status_bubble.h"
22 #include "chrome/browser/ui/tabs/tab_strip_model.h" 23 #include "chrome/browser/ui/tabs/tab_strip_model.h"
23 #include "chrome/browser/ui/web_contents_sizer.h" 24 #include "chrome/browser/ui/web_contents_sizer.h"
24 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
25 #include "components/content_settings/core/browser/host_content_settings_map.h" 26 #include "components/content_settings/core/browser/host_content_settings_map.h"
26 #include "content/public/browser/navigation_details.h" 27 #include "content/public/browser/navigation_details.h"
27 #include "content/public/browser/navigation_entry.h" 28 #include "content/public/browser/navigation_entry.h"
28 #include "content/public/browser/notification_service.h" 29 #include "content/public/browser/notification_service.h"
29 #include "content/public/browser/render_view_host.h" 30 #include "content/public/browser/render_view_host.h"
30 #include "content/public/browser/render_widget_host_view.h" 31 #include "content/public/browser/render_widget_host_view.h"
31 #include "content/public/browser/user_metrics.h"
32 #include "content/public/browser/web_contents.h" 32 #include "content/public/browser/web_contents.h"
33 #include "extensions/common/extension.h" 33 #include "extensions/common/extension.h"
34 34
35 #if !defined(OS_MACOSX) 35 #if !defined(OS_MACOSX)
36 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
37 #include "components/prefs/pref_service.h" 37 #include "components/prefs/pref_service.h"
38 #endif 38 #endif
39 39
40 using base::UserMetricsAction; 40 using base::UserMetricsAction;
41 using content::RenderViewHost; 41 using content::RenderViewHost;
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 GURL url; 362 GURL url;
363 if (option == TAB) { 363 if (option == TAB) {
364 url = GetRequestingOrigin(); 364 url = GetRequestingOrigin();
365 tab_fullscreen_ = true; 365 tab_fullscreen_ = true;
366 } else { 366 } else {
367 if (!extension_caused_fullscreen_.is_empty()) 367 if (!extension_caused_fullscreen_.is_empty())
368 url = extension_caused_fullscreen_; 368 url = extension_caused_fullscreen_;
369 } 369 }
370 370
371 if (option == BROWSER) 371 if (option == BROWSER)
372 content::RecordAction(UserMetricsAction("ToggleFullscreen")); 372 base::RecordAction(UserMetricsAction("ToggleFullscreen"));
373 // TODO(scheib): Record metrics for WITH_TOOLBAR, without counting transitions 373 // TODO(scheib): Record metrics for WITH_TOOLBAR, without counting transitions
374 // from tab fullscreen out to browser with toolbar. 374 // from tab fullscreen out to browser with toolbar.
375 375
376 exclusive_access_manager()->context()->EnterFullscreen( 376 exclusive_access_manager()->context()->EnterFullscreen(
377 url, exclusive_access_manager()->GetExclusiveAccessExitBubbleType()); 377 url, exclusive_access_manager()->GetExclusiveAccessExitBubbleType());
378 378
379 exclusive_access_manager()->UpdateExclusiveAccessExitBubbleContent(); 379 exclusive_access_manager()->UpdateExclusiveAccessExitBubbleContent();
380 380
381 // Once the window has become fullscreen it'll call back to 381 // Once the window has become fullscreen it'll call back to
382 // WindowFullscreenStateChanged(). We don't do this immediately as 382 // WindowFullscreenStateChanged(). We don't do this immediately as
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 return fullscreened_origin_; 452 return fullscreened_origin_;
453 453
454 return exclusive_access_tab()->GetLastCommittedURL(); 454 return exclusive_access_tab()->GetLastCommittedURL();
455 } 455 }
456 456
457 GURL FullscreenController::GetEmbeddingOrigin() const { 457 GURL FullscreenController::GetEmbeddingOrigin() const {
458 DCHECK(exclusive_access_tab()); 458 DCHECK(exclusive_access_tab());
459 459
460 return exclusive_access_tab()->GetLastCommittedURL(); 460 return exclusive_access_tab()->GetLastCommittedURL();
461 } 461 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('k') | chrome/browser/ui/page_info/page_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698