| 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 2054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2065 } | 2065 } |
| 2066 | 2066 |
| 2067 void Browser::OpenBookmarkManagerForNode(int64 node_id) { | 2067 void Browser::OpenBookmarkManagerForNode(int64 node_id) { |
| 2068 OpenBookmarkManagerWithHash("", node_id); | 2068 OpenBookmarkManagerWithHash("", node_id); |
| 2069 } | 2069 } |
| 2070 | 2070 |
| 2071 void Browser::OpenBookmarkManagerEditNode(int64 node_id) { | 2071 void Browser::OpenBookmarkManagerEditNode(int64 node_id) { |
| 2072 OpenBookmarkManagerWithHash("e=", node_id); | 2072 OpenBookmarkManagerWithHash("e=", node_id); |
| 2073 } | 2073 } |
| 2074 | 2074 |
| 2075 void Browser::OpenBookmarkManagerAddNodeIn(int64 node_id) { | |
| 2076 OpenBookmarkManagerWithHash("a=", node_id); | |
| 2077 } | |
| 2078 | |
| 2079 void Browser::ShowAppMenu() { | 2075 void Browser::ShowAppMenu() { |
| 2080 // We record the user metric for this event in WrenchMenu::RunMenu. | 2076 // We record the user metric for this event in WrenchMenu::RunMenu. |
| 2081 window_->ShowAppMenu(); | 2077 window_->ShowAppMenu(); |
| 2082 } | 2078 } |
| 2083 | 2079 |
| 2084 void Browser::ShowHistoryTab() { | 2080 void Browser::ShowHistoryTab() { |
| 2085 UserMetrics::RecordAction(UserMetricsAction("ShowHistory")); | 2081 UserMetrics::RecordAction(UserMetricsAction("ShowHistory")); |
| 2086 ShowSingletonTabOverwritingNTP( | 2082 ShowSingletonTabOverwritingNTP( |
| 2087 GetSingletonTabNavigateParams(GURL(chrome::kChromeUIHistoryURL))); | 2083 GetSingletonTabNavigateParams(GURL(chrome::kChromeUIHistoryURL))); |
| 2088 } | 2084 } |
| (...skipping 3445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5534 } | 5530 } |
| 5535 | 5531 |
| 5536 void Browser::UpdateFullscreenExitBubbleContent() { | 5532 void Browser::UpdateFullscreenExitBubbleContent() { |
| 5537 GURL url; | 5533 GURL url; |
| 5538 if (fullscreened_tab_) | 5534 if (fullscreened_tab_) |
| 5539 url = fullscreened_tab_->tab_contents()->GetURL(); | 5535 url = fullscreened_tab_->tab_contents()->GetURL(); |
| 5540 | 5536 |
| 5541 window_->UpdateFullscreenExitBubbleContent( | 5537 window_->UpdateFullscreenExitBubbleContent( |
| 5542 url, GetFullscreenExitBubbleType()); | 5538 url, GetFullscreenExitBubbleType()); |
| 5543 } | 5539 } |
| OLD | NEW |