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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 8656004: Remove more totally obvious usage of: defined(TOUCH_UI) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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/chromeos/frame/browser_view.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 22 matching lines...) Expand all
33 33
34 #if defined(TOOLKIT_USES_GTK) 34 #if defined(TOOLKIT_USES_GTK)
35 #include <gtk/gtk.h> 35 #include <gtk/gtk.h>
36 #endif 36 #endif
37 37
38 #if defined(USE_AURA) 38 #if defined(USE_AURA)
39 #include "chrome/browser/chromeos/legacy_window_manager/initial_browser_window_o bserver.h" 39 #include "chrome/browser/chromeos/legacy_window_manager/initial_browser_window_o bserver.h"
40 #endif 40 #endif
41 41
42 class MessageLoopObserver : public MessageLoopForUI::Observer { 42 class MessageLoopObserver : public MessageLoopForUI::Observer {
43 #if defined(TOUCH_UI) || defined(USE_AURA) 43 #if defined(USE_AURA)
44 virtual base::EventStatus WillProcessEvent( 44 virtual base::EventStatus WillProcessEvent(
45 const base::NativeEvent& event) OVERRIDE { 45 const base::NativeEvent& event) OVERRIDE {
46 return base::EVENT_CONTINUE; 46 return base::EVENT_CONTINUE;
47 } 47 }
48 48
49 virtual void DidProcessEvent( 49 virtual void DidProcessEvent(
50 const base::NativeEvent& event) OVERRIDE { 50 const base::NativeEvent& event) OVERRIDE {
51 } 51 }
52 #else 52 #else
53 virtual void WillProcessEvent(GdkEvent* event) { 53 virtual void WillProcessEvent(GdkEvent* event) {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // DBusThreadManager is shut down. 215 // DBusThreadManager is shut down.
216 if (session_manager_observer_.get()) { 216 if (session_manager_observer_.get()) {
217 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 217 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
218 RemoveObserver(session_manager_observer_.get()); 218 RemoveObserver(session_manager_observer_.get());
219 } 219 }
220 if (brightness_observer_.get()) { 220 if (brightness_observer_.get()) {
221 chromeos::DBusThreadManager::Get()->GetPowerManagerClient() 221 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
222 ->RemoveObserver(brightness_observer_.get()); 222 ->RemoveObserver(brightness_observer_.get());
223 } 223 }
224 } 224 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698