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

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

Issue 11039034: Move ash/system/network to ash/system/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 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 | « ash/system/tray_display.cc ('k') | chrome/browser/chromeos/sms_observer.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/chromeos/network_message_observer.h" 5 #include "chrome/browser/chromeos/network_message_observer.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/network/network_observer.h" 9 #include "ash/system/chromeos/network/network_observer.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/chromeos/cros/cros_library.h" 16 #include "chrome/browser/chromeos/cros/cros_library.h"
17 #include "chrome/browser/chromeos/cros/network_library.h" 17 #include "chrome/browser/chromeos/cros/network_library.h"
18 #include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h" 18 #include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h"
19 #include "chrome/browser/prefs/pref_service.h" 19 #include "chrome/browser/prefs/pref_service.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 if (plan) { 362 if (plan) {
363 cellular_data_plan_unique_id_ = plan->GetUniqueIdentifier(); 363 cellular_data_plan_unique_id_ = plan->GetUniqueIdentifier();
364 cellular_data_plan_type_ = plan->plan_type; 364 cellular_data_plan_type_ = plan->plan_type;
365 } else { 365 } else {
366 cellular_data_plan_unique_id_ = std::string(); 366 cellular_data_plan_unique_id_ = std::string();
367 cellular_data_plan_type_ = CELLULAR_DATA_PLAN_UNKNOWN; 367 cellular_data_plan_type_ = CELLULAR_DATA_PLAN_UNKNOWN;
368 } 368 }
369 } 369 }
370 370
371 } // namespace chromeos 371 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/tray_display.cc ('k') | chrome/browser/chromeos/sms_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698