| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 1840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1851 case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE: | 1851 case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE: |
| 1852 uma_string = "DevTools_ToggleConsole"; | 1852 uma_string = "DevTools_ToggleConsole"; |
| 1853 break; | 1853 break; |
| 1854 case DEVTOOLS_TOGGLE_ACTION_NONE: | 1854 case DEVTOOLS_TOGGLE_ACTION_NONE: |
| 1855 case DEVTOOLS_TOGGLE_ACTION_INSPECT: | 1855 case DEVTOOLS_TOGGLE_ACTION_INSPECT: |
| 1856 default: | 1856 default: |
| 1857 uma_string = "DevTools_ToggleWindow"; | 1857 uma_string = "DevTools_ToggleWindow"; |
| 1858 break; | 1858 break; |
| 1859 } | 1859 } |
| 1860 UserMetrics::RecordAction(UserMetricsAction(uma_string.c_str())); | 1860 UserMetrics::RecordAction(UserMetricsAction(uma_string.c_str())); |
| 1861 DevToolsManager::GetInstance()->ToggleDevToolsWindow( | 1861 DevToolsWindow::ToggleDevToolsWindow( |
| 1862 GetSelectedTabContentsWrapper()->render_view_host(), action); | 1862 GetSelectedTabContentsWrapper()->render_view_host(), action); |
| 1863 } | 1863 } |
| 1864 | 1864 |
| 1865 void Browser::OpenTaskManager(bool highlight_background_resources) { | 1865 void Browser::OpenTaskManager(bool highlight_background_resources) { |
| 1866 UserMetrics::RecordAction(UserMetricsAction("TaskManager")); | 1866 UserMetrics::RecordAction(UserMetricsAction("TaskManager")); |
| 1867 if (highlight_background_resources) | 1867 if (highlight_background_resources) |
| 1868 window_->ShowBackgroundPages(); | 1868 window_->ShowBackgroundPages(); |
| 1869 else | 1869 else |
| 1870 window_->ShowTaskManager(); | 1870 window_->ShowTaskManager(); |
| 1871 } | 1871 } |
| (...skipping 2849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4721 // end up querying state once they process the tab switch. | 4721 // end up querying state once they process the tab switch. |
| 4722 return; | 4722 return; |
| 4723 } | 4723 } |
| 4724 | 4724 |
| 4725 BookmarkBar::AnimateChangeType animate_type = | 4725 BookmarkBar::AnimateChangeType animate_type = |
| 4726 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? | 4726 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? |
| 4727 BookmarkBar::ANIMATE_STATE_CHANGE : | 4727 BookmarkBar::ANIMATE_STATE_CHANGE : |
| 4728 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; | 4728 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; |
| 4729 window_->BookmarkBarStateChanged(animate_type); | 4729 window_->BookmarkBarStateChanged(animate_type); |
| 4730 } | 4730 } |
| OLD | NEW |