| 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 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1179 download_shelf_.reset(new DownloadShelfView(browser_.get(), this)); | 1179 download_shelf_.reset(new DownloadShelfView(browser_.get(), this)); |
| 1180 download_shelf_->set_owned_by_client(); | 1180 download_shelf_->set_owned_by_client(); |
| 1181 } | 1181 } |
| 1182 return download_shelf_.get(); | 1182 return download_shelf_.get(); |
| 1183 } | 1183 } |
| 1184 | 1184 |
| 1185 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { | 1185 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { |
| 1186 DownloadInProgressDialogView::Show(browser_.get(), GetNativeWindow()); | 1186 DownloadInProgressDialogView::Show(browser_.get(), GetNativeWindow()); |
| 1187 } | 1187 } |
| 1188 | 1188 |
| 1189 void BrowserView::ShowCreateWebAppShortcutsDialog(TabContents* tab_contents) { | |
| 1190 chrome::ShowCreateWebAppShortcutsDialog(GetNativeWindow(), tab_contents); | |
| 1191 } | |
| 1192 | |
| 1193 void BrowserView::ShowCreateChromeAppShortcutsDialog( | 1189 void BrowserView::ShowCreateChromeAppShortcutsDialog( |
| 1194 Profile* profile, | 1190 Profile* profile, |
| 1195 const extensions::Extension* app) { | 1191 const extensions::Extension* app) { |
| 1196 chrome::ShowCreateChromeAppShortcutsDialog(GetNativeWindow(), profile, app); | 1192 chrome::ShowCreateChromeAppShortcutsDialog(GetNativeWindow(), profile, app); |
| 1197 } | 1193 } |
| 1198 | 1194 |
| 1199 void BrowserView::UserChangedTheme() { | 1195 void BrowserView::UserChangedTheme() { |
| 1200 frame_->FrameTypeChanged(); | 1196 frame_->FrameTypeChanged(); |
| 1201 } | 1197 } |
| 1202 | 1198 |
| (...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2567 bubble->Show(); | 2563 bubble->Show(); |
| 2568 } | 2564 } |
| 2569 | 2565 |
| 2570 void BrowserView::RestackLocationBarContainer() { | 2566 void BrowserView::RestackLocationBarContainer() { |
| 2571 #if defined(USE_AURA) | 2567 #if defined(USE_AURA) |
| 2572 if (search_view_controller_.get()) | 2568 if (search_view_controller_.get()) |
| 2573 search_view_controller_->StackAtTop(); | 2569 search_view_controller_->StackAtTop(); |
| 2574 #endif | 2570 #endif |
| 2575 toolbar_->location_bar_container()->StackAtTop(); | 2571 toolbar_->location_bar_container()->StackAtTop(); |
| 2576 } | 2572 } |
| OLD | NEW |