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

Side by Side Diff: content/shell/browser/shell_aura.cc

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 "content/shell/shell.h" 5 #include "content/shell/browser/shell.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/browser/web_contents_view.h" 10 #include "content/public/browser/web_contents_view.h"
11 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
12 #include "ui/aura/root_window.h" 12 #include "ui/aura/root_window.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/base/accessibility/accessibility_types.h" 14 #include "ui/base/accessibility/accessibility_types.h"
15 #include "ui/base/clipboard/clipboard.h" 15 #include "ui/base/clipboard/clipboard.h"
16 #include "ui/base/events/event.h" 16 #include "ui/base/events/event.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gfx/screen.h" 18 #include "ui/gfx/screen.h"
19 #include "ui/views/controls/button/label_button.h" 19 #include "ui/views/controls/button/label_button.h"
20 #include "ui/views/controls/textfield/textfield.h" 20 #include "ui/views/controls/textfield/textfield.h"
21 #include "ui/views/controls/textfield/textfield_controller.h" 21 #include "ui/views/controls/textfield/textfield_controller.h"
22 #include "ui/views/controls/webview/webview.h" 22 #include "ui/views/controls/webview/webview.h"
23 #include "ui/views/layout/fill_layout.h" 23 #include "ui/views/layout/fill_layout.h"
24 #include "ui/views/layout/grid_layout.h" 24 #include "ui/views/layout/grid_layout.h"
25 #include "ui/views/test/desktop_test_views_delegate.h" 25 #include "ui/views/test/desktop_test_views_delegate.h"
26 #include "ui/views/view.h" 26 #include "ui/views/view.h"
27 #include "ui/views/widget/desktop_aura/desktop_screen.h" 27 #include "ui/views/widget/desktop_aura/desktop_screen.h"
28 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
29 #include "ui/views/widget/widget_delegate.h" 29 #include "ui/views/widget/widget_delegate.h"
30 30
31 #if defined(OS_CHROMEOS) 31 #if defined(OS_CHROMEOS)
32 #include "chromeos/dbus/dbus_thread_manager.h" 32 #include "chromeos/dbus/dbus_thread_manager.h"
33 #include "content/shell/minimal_shell.h" 33 #include "content/shell/browser/minimal_shell.h"
34 #include "ui/aura/test/test_screen.h" 34 #include "ui/aura/test/test_screen.h"
35 #endif 35 #endif
36 36
37 namespace content { 37 namespace content {
38 38
39 namespace { 39 namespace {
40 // ViewDelegate implementation for aura content shell 40 // ViewDelegate implementation for aura content shell
41 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate { 41 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate {
42 public: 42 public:
43 ShellViewsDelegateAura() : use_transparent_windows_(false) { 43 ShellViewsDelegateAura() : use_transparent_windows_(false) {
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 } 365 }
366 366
367 void Shell::PlatformSetTitle(const string16& title) { 367 void Shell::PlatformSetTitle(const string16& title) {
368 ShellWindowDelegateView* delegate_view = 368 ShellWindowDelegateView* delegate_view =
369 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); 369 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
370 delegate_view->SetWindowTitle(title); 370 delegate_view->SetWindowTitle(title);
371 window_widget_->UpdateWindowTitle(); 371 window_widget_->UpdateWindowTitle();
372 } 372 }
373 373
374 } // namespace content 374 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_application_mac.mm ('k') | content/shell/browser/shell_browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698