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/gtk/browser_window_gtk.h" | 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
6 | 6 |
7 #include <dlfcn.h> | 7 #include <dlfcn.h> |
8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1083 bool already_bookmarked) { | 1083 bool already_bookmarked) { |
1084 toolbar_->GetLocationBarView()->ShowStarBubble(url, !already_bookmarked); | 1084 toolbar_->GetLocationBarView()->ShowStarBubble(url, !already_bookmarked); |
1085 } | 1085 } |
1086 | 1086 |
1087 void BrowserWindowGtk::ShowChromeToMobileBubble() { | 1087 void BrowserWindowGtk::ShowChromeToMobileBubble() { |
1088 toolbar_->GetLocationBarView()->ShowChromeToMobileBubble(); | 1088 toolbar_->GetLocationBarView()->ShowChromeToMobileBubble(); |
1089 } | 1089 } |
1090 | 1090 |
1091 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 1091 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
1092 void BrowserWindowGtk::ShowOneClickSigninBubble( | 1092 void BrowserWindowGtk::ShowOneClickSigninBubble( |
1093 const base::Closure& learn_more_callback, | 1093 const StartSyncCallback& start_sync_callback) { |
1094 const base::Closure& advanced_callback) { | 1094 ignore_result(new OneClickSigninBubbleGtk(this, start_sync_callback)); |
Peter Kasting
2012/05/24 22:25:18
Nit: Do we need ignore_result() here? new() isn't
Roger Tawa OOO till Jul 10th
2012/05/25 16:04:08
Done.
| |
1095 ignore_result(new OneClickSigninBubbleGtk(this, learn_more_callback, | |
1096 advanced_callback)); | |
1097 } | 1095 } |
1098 #endif | 1096 #endif |
1099 | 1097 |
1100 bool BrowserWindowGtk::IsDownloadShelfVisible() const { | 1098 bool BrowserWindowGtk::IsDownloadShelfVisible() const { |
1101 return download_shelf_.get() && download_shelf_->IsShowing(); | 1099 return download_shelf_.get() && download_shelf_->IsShowing(); |
1102 } | 1100 } |
1103 | 1101 |
1104 DownloadShelf* BrowserWindowGtk::GetDownloadShelf() { | 1102 DownloadShelf* BrowserWindowGtk::GetDownloadShelf() { |
1105 if (!download_shelf_.get()) | 1103 if (!download_shelf_.get()) |
1106 download_shelf_.reset(new DownloadShelfGtk(browser_.get(), | 1104 download_shelf_.reset(new DownloadShelfGtk(browser_.get(), |
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2601 wm_type == ui::WM_OPENBOX || | 2599 wm_type == ui::WM_OPENBOX || |
2602 wm_type == ui::WM_XFWM4); | 2600 wm_type == ui::WM_XFWM4); |
2603 } | 2601 } |
2604 | 2602 |
2605 // static | 2603 // static |
2606 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2604 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
2607 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2605 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
2608 browser_window_gtk->Init(); | 2606 browser_window_gtk->Init(); |
2609 return browser_window_gtk; | 2607 return browser_window_gtk; |
2610 } | 2608 } |
OLD | NEW |