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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10828247: launcher: Switch from views/ to ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.cc ('k') | chrome/chrome_browser.gypi » ('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/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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #include "ui/views/widget/native_widget.h" 108 #include "ui/views/widget/native_widget.h"
109 #include "ui/views/widget/root_view.h" 109 #include "ui/views/widget/root_view.h"
110 #include "ui/views/widget/widget.h" 110 #include "ui/views/widget/widget.h"
111 #include "ui/views/window/dialog_delegate.h" 111 #include "ui/views/window/dialog_delegate.h"
112 112
113 #if defined(USE_ASH) 113 #if defined(USE_ASH)
114 #include "ash/launcher/launcher.h" 114 #include "ash/launcher/launcher.h"
115 #include "ash/launcher/launcher_model.h" 115 #include "ash/launcher/launcher_model.h"
116 #include "ash/shell.h" 116 #include "ash/shell.h"
117 #include "chrome/browser/ui/ash/ash_util.h" 117 #include "chrome/browser/ui/ash/ash_util.h"
118 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
118 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 119 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
119 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h"
120 #include "chrome/browser/ui/views/ash/window_positioner.h" 120 #include "chrome/browser/ui/views/ash/window_positioner.h"
121 #elif defined(OS_WIN) && !defined(USE_AURA) 121 #elif defined(OS_WIN) && !defined(USE_AURA)
122 #include "base/win/metro.h" 122 #include "base/win/metro.h"
123 #include "chrome/browser/jumplist_win.h" 123 #include "chrome/browser/jumplist_win.h"
124 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" 124 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
125 #include "ui/views/widget/native_widget_win.h" 125 #include "ui/views/widget/native_widget_win.h"
126 #endif 126 #endif
127 127
128 #if defined(USE_AURA) 128 #if defined(USE_AURA)
129 #include "chrome/browser/ui/views/accelerator_table.h" 129 #include "chrome/browser/ui/views/accelerator_table.h"
(...skipping 2456 matching lines...) Expand 10 before | Expand all | Expand 10 after
2586 if (contents && contents->GetContentNativeView() && 2586 if (contents && contents->GetContentNativeView() &&
2587 contents->GetContentNativeView()->HasFocus()) { 2587 contents->GetContentNativeView()->HasFocus()) {
2588 (contents->GetRenderViewHost()->*method)(); 2588 (contents->GetRenderViewHost()->*method)();
2589 return true; 2589 return true;
2590 } 2590 }
2591 #elif defined(OS_WIN) 2591 #elif defined(OS_WIN)
2592 // TODO(yusukes): Support non-Aura Windows. 2592 // TODO(yusukes): Support non-Aura Windows.
2593 #endif 2593 #endif
2594 return false; 2594 return false;
2595 } 2595 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698