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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "content/public/browser/download_manager.h" 86 #include "content/public/browser/download_manager.h"
87 #include "content/public/browser/native_web_keyboard_event.h" 87 #include "content/public/browser/native_web_keyboard_event.h"
88 #include "content/public/browser/notification_service.h" 88 #include "content/public/browser/notification_service.h"
89 #include "content/public/browser/render_view_host.h" 89 #include "content/public/browser/render_view_host.h"
90 #include "content/public/browser/render_widget_host_view.h" 90 #include "content/public/browser/render_widget_host_view.h"
91 #include "content/public/browser/web_contents.h" 91 #include "content/public/browser/web_contents.h"
92 #include "content/public/browser/web_contents_view.h" 92 #include "content/public/browser/web_contents_view.h"
93 #include "grit/chromium_strings.h" 93 #include "grit/chromium_strings.h"
94 #include "grit/generated_resources.h" 94 #include "grit/generated_resources.h"
95 #include "grit/theme_resources.h" 95 #include "grit/theme_resources.h"
96 #include "grit/theme_resources_standard.h"
97 #include "grit/ui_resources.h" 96 #include "grit/ui_resources.h"
98 #include "ui/base/gtk/gtk_floating_container.h" 97 #include "ui/base/gtk/gtk_floating_container.h"
99 #include "ui/base/gtk/gtk_hig_constants.h" 98 #include "ui/base/gtk/gtk_hig_constants.h"
100 #include "ui/base/gtk/gtk_screen_util.h" 99 #include "ui/base/gtk/gtk_screen_util.h"
101 #include "ui/base/keycodes/keyboard_codes.h" 100 #include "ui/base/keycodes/keyboard_codes.h"
102 #include "ui/base/l10n/l10n_util.h" 101 #include "ui/base/l10n/l10n_util.h"
103 #include "ui/base/resource/resource_bundle.h" 102 #include "ui/base/resource/resource_bundle.h"
104 #include "ui/base/x/active_window_watcher_x.h" 103 #include "ui/base/x/active_window_watcher_x.h"
105 #include "ui/gfx/gtk_util.h" 104 #include "ui/gfx/gtk_util.h"
106 #include "ui/gfx/image/cairo_cached_surface.h" 105 #include "ui/gfx/image/cairo_cached_surface.h"
(...skipping 2491 matching lines...) Expand 10 before | Expand all | Expand 10 after
2598 wm_type == ui::WM_OPENBOX || 2597 wm_type == ui::WM_OPENBOX ||
2599 wm_type == ui::WM_XFWM4); 2598 wm_type == ui::WM_XFWM4);
2600 } 2599 }
2601 2600
2602 // static 2601 // static
2603 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 2602 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
2604 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); 2603 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
2605 browser_window_gtk->Init(); 2604 browser_window_gtk->Init();
2606 return browser_window_gtk; 2605 return browser_window_gtk;
2607 } 2606 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698