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

Side by Side Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 years, 8 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/views/tabs/browser_tab_strip_controller.h" 5 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/metrics/user_metrics.h"
9 #include "base/task_scheduler/post_task.h" 10 #include "base/task_scheduler/post_task.h"
10 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 12 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
12 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/extensions/tab_helper.h" 15 #include "chrome/browser/extensions/tab_helper.h"
15 #include "chrome/browser/favicon/favicon_utils.h" 16 #include "chrome/browser/favicon/favicon_utils.h"
16 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/search/search.h" 18 #include "chrome/browser/search/search.h"
18 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
(...skipping 12 matching lines...) Expand all
31 #include "components/mime_util/mime_util.h" 32 #include "components/mime_util/mime_util.h"
32 #include "components/omnibox/browser/autocomplete_classifier.h" 33 #include "components/omnibox/browser/autocomplete_classifier.h"
33 #include "components/omnibox/browser/autocomplete_match.h" 34 #include "components/omnibox/browser/autocomplete_match.h"
34 #include "components/prefs/pref_service.h" 35 #include "components/prefs/pref_service.h"
35 #include "content/public/browser/browser_thread.h" 36 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/navigation_controller.h" 37 #include "content/public/browser/navigation_controller.h"
37 #include "content/public/browser/navigation_entry.h" 38 #include "content/public/browser/navigation_entry.h"
38 #include "content/public/browser/navigation_handle.h" 39 #include "content/public/browser/navigation_handle.h"
39 #include "content/public/browser/notification_service.h" 40 #include "content/public/browser/notification_service.h"
40 #include "content/public/browser/plugin_service.h" 41 #include "content/public/browser/plugin_service.h"
41 #include "content/public/browser/user_metrics.h"
42 #include "content/public/browser/web_contents.h" 42 #include "content/public/browser/web_contents.h"
43 #include "content/public/common/webplugininfo.h" 43 #include "content/public/common/webplugininfo.h"
44 #include "ipc/ipc_message.h" 44 #include "ipc/ipc_message.h"
45 #include "net/base/filename_util.h" 45 #include "net/base/filename_util.h"
46 #include "ui/base/models/list_selection_model.h" 46 #include "ui/base/models/list_selection_model.h"
47 #include "ui/gfx/image/image.h" 47 #include "ui/gfx/image/image.h"
48 #include "ui/views/controls/menu/menu_runner.h" 48 #include "ui/views/controls/menu/menu_runner.h"
49 #include "ui/views/widget/widget.h" 49 #include "ui/views/widget/widget.h"
50 #include "url/origin.h" 50 #include "url/origin.h"
51 51
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 } 346 }
347 347
348 void BrowserTabStripController::PerformDrop(bool drop_before, 348 void BrowserTabStripController::PerformDrop(bool drop_before,
349 int index, 349 int index,
350 const GURL& url) { 350 const GURL& url) {
351 chrome::NavigateParams params(browser_view_->browser(), url, 351 chrome::NavigateParams params(browser_view_->browser(), url,
352 ui::PAGE_TRANSITION_LINK); 352 ui::PAGE_TRANSITION_LINK);
353 params.tabstrip_index = index; 353 params.tabstrip_index = index;
354 354
355 if (drop_before) { 355 if (drop_before) {
356 content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs")); 356 base::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"));
357 params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB; 357 params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
358 } else { 358 } else {
359 content::RecordAction(UserMetricsAction("Tab_DropURLOnTab")); 359 base::RecordAction(UserMetricsAction("Tab_DropURLOnTab"));
360 params.disposition = WindowOpenDisposition::CURRENT_TAB; 360 params.disposition = WindowOpenDisposition::CURRENT_TAB;
361 params.source_contents = model_->GetWebContentsAt(index); 361 params.source_contents = model_->GetWebContentsAt(index);
362 } 362 }
363 params.window_action = chrome::NavigateParams::SHOW_WINDOW; 363 params.window_action = chrome::NavigateParams::SHOW_WINDOW;
364 chrome::Navigate(&params); 364 chrome::Navigate(&params);
365 } 365 }
366 366
367 bool BrowserTabStripController::IsCompatibleWith(TabStrip* other) const { 367 bool BrowserTabStripController::IsCompatibleWith(TabStrip* other) const {
368 Profile* other_profile = 368 Profile* other_profile =
369 static_cast<BrowserTabStripController*>(other->controller())->profile(); 369 static_cast<BrowserTabStripController*>(other->controller())->profile();
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 content::WebPluginInfo plugin; 587 content::WebPluginInfo plugin;
588 tabstrip_->FileSupported( 588 tabstrip_->FileSupported(
589 url, 589 url,
590 mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) || 590 mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) ||
591 content::PluginService::GetInstance()->GetPluginInfo( 591 content::PluginService::GetInstance()->GetPluginInfo(
592 -1, // process ID 592 -1, // process ID
593 MSG_ROUTING_NONE, // routing ID 593 MSG_ROUTING_NONE, // routing ID
594 model_->profile()->GetResourceContext(), url, url::Origin(), 594 model_->profile()->GetResourceContext(), url, url::Origin(),
595 mime_type, false, NULL, &plugin, NULL)); 595 mime_type, false, NULL, &plugin, NULL));
596 } 596 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/alert_indicator_button.cc ('k') | chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698