OLD | NEW |
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/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1104 void BrowserView::ConfirmAddSearchProvider(TemplateURL* template_url, | 1104 void BrowserView::ConfirmAddSearchProvider(TemplateURL* template_url, |
1105 Profile* profile) { | 1105 Profile* profile) { |
1106 chrome::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL, | 1106 chrome::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL, |
1107 profile); | 1107 profile); |
1108 } | 1108 } |
1109 | 1109 |
1110 void BrowserView::ToggleBookmarkBar() { | 1110 void BrowserView::ToggleBookmarkBar() { |
1111 bookmark_utils::ToggleWhenVisible(browser_->profile()); | 1111 bookmark_utils::ToggleWhenVisible(browser_->profile()); |
1112 } | 1112 } |
1113 | 1113 |
1114 void BrowserView::ShowAboutChromeDialog() { | |
1115 chrome::ShowAboutChromeView(GetWidget()->GetNativeWindow(), browser_.get()); | |
1116 } | |
1117 | |
1118 void BrowserView::ShowUpdateChromeDialog() { | 1114 void BrowserView::ShowUpdateChromeDialog() { |
1119 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); | 1115 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); |
1120 } | 1116 } |
1121 | 1117 |
1122 void BrowserView::ShowTaskManager() { | 1118 void BrowserView::ShowTaskManager() { |
1123 #if defined(USE_AURA) | 1119 #if defined(USE_AURA) |
1124 TaskManagerDialog::Show(); | 1120 TaskManagerDialog::Show(); |
1125 #else | 1121 #else |
1126 chrome::ShowTaskManager(); | 1122 chrome::ShowTaskManager(); |
1127 #endif // defined(USE_AURA) | 1123 #endif // defined(USE_AURA) |
(...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2583 if (contents && contents->GetContentNativeView() && | 2579 if (contents && contents->GetContentNativeView() && |
2584 contents->GetContentNativeView()->HasFocus()) { | 2580 contents->GetContentNativeView()->HasFocus()) { |
2585 (contents->GetRenderViewHost()->*method)(); | 2581 (contents->GetRenderViewHost()->*method)(); |
2586 return true; | 2582 return true; |
2587 } | 2583 } |
2588 #elif defined(OS_WIN) | 2584 #elif defined(OS_WIN) |
2589 // TODO(yusukes): Support non-Aura Windows. | 2585 // TODO(yusukes): Support non-Aura Windows. |
2590 #endif | 2586 #endif |
2591 return false; | 2587 return false; |
2592 } | 2588 } |
OLD | NEW |