Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 9379016: (WIP) Website Settings GTK UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tmp Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/website_settings_popup_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" 67 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
68 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" 68 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
69 #include "chrome/browser/ui/gtk/task_manager_gtk.h" 69 #include "chrome/browser/ui/gtk/task_manager_gtk.h"
70 #include "chrome/browser/ui/gtk/theme_service_gtk.h" 70 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
71 #include "chrome/browser/ui/gtk/update_recommended_dialog.h" 71 #include "chrome/browser/ui/gtk/update_recommended_dialog.h"
72 #include "chrome/browser/ui/omnibox/location_bar.h" 72 #include "chrome/browser/ui/omnibox/location_bar.h"
73 #include "chrome/browser/ui/omnibox/omnibox_view.h" 73 #include "chrome/browser/ui/omnibox/omnibox_view.h"
74 #include "chrome/browser/ui/page_info_bubble.h" 74 #include "chrome/browser/ui/page_info_bubble.h"
75 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 75 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
76 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" 76 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
77 #include "chrome/browser/ui/website_settings_popup.h"
77 #include "chrome/browser/web_applications/web_app.h" 78 #include "chrome/browser/web_applications/web_app.h"
78 #include "chrome/common/chrome_notification_types.h" 79 #include "chrome/common/chrome_notification_types.h"
79 #include "chrome/common/chrome_switches.h" 80 #include "chrome/common/chrome_switches.h"
80 #include "chrome/common/pref_names.h" 81 #include "chrome/common/pref_names.h"
81 #include "content/public/browser/download_manager.h" 82 #include "content/public/browser/download_manager.h"
82 #include "content/public/browser/native_web_keyboard_event.h" 83 #include "content/public/browser/native_web_keyboard_event.h"
83 #include "content/public/browser/notification_service.h" 84 #include "content/public/browser/notification_service.h"
84 #include "content/public/browser/render_view_host.h" 85 #include "content/public/browser/render_view_host.h"
85 #include "content/public/browser/render_widget_host_view.h" 86 #include "content/public/browser/render_widget_host_view.h"
86 #include "content/public/browser/web_contents.h" 87 #include "content/public/browser/web_contents.h"
(...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 bool show_history) { 1115 bool show_history) {
1115 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history); 1116 browser::ShowPageInfoBubble(window_, profile, url, ssl, show_history);
1116 } 1117 }
1117 1118
1118 void BrowserWindowGtk::ShowWebsiteSettings( 1119 void BrowserWindowGtk::ShowWebsiteSettings(
1119 Profile* profile, 1120 Profile* profile,
1120 TabContentsWrapper* tab_contents_wrapper, 1121 TabContentsWrapper* tab_contents_wrapper,
1121 const GURL& url, 1122 const GURL& url,
1122 const content::SSLStatus& ssl, 1123 const content::SSLStatus& ssl,
1123 bool show_history) { 1124 bool show_history) {
1125 WebsiteSettingsPopup::Show(
1126 GetNativeHandle(),
1127 profile,
1128 tab_contents_wrapper,
1129 url,
1130 ssl,
1131 show_history);
1124 } 1132 }
1125 1133
1126 void BrowserWindowGtk::ShowAppMenu() { 1134 void BrowserWindowGtk::ShowAppMenu() {
1127 toolbar_->ShowAppMenu(); 1135 toolbar_->ShowAppMenu();
1128 } 1136 }
1129 1137
1130 bool BrowserWindowGtk::PreHandleKeyboardEvent( 1138 bool BrowserWindowGtk::PreHandleKeyboardEvent(
1131 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { 1139 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) {
1132 GdkEventKey* os_event = &event.os_event->key; 1140 GdkEventKey* os_event = &event.os_event->key;
1133 1141
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
2568 wm_type == ui::WM_OPENBOX || 2576 wm_type == ui::WM_OPENBOX ||
2569 wm_type == ui::WM_XFWM4); 2577 wm_type == ui::WM_XFWM4);
2570 } 2578 }
2571 2579
2572 // static 2580 // static
2573 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 2581 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
2574 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); 2582 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
2575 browser_window_gtk->Init(); 2583 browser_window_gtk->Init();
2576 return browser_window_gtk; 2584 return browser_window_gtk;
2577 } 2585 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/website_settings_popup_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698